v0.0.4 merge fixes
Co-Authored-By: erebus <erebus@rikspolisen.se>
Co-Committed-By: erebus <erebus@rikspolisen.se>
This commit was merged in pull request #4.
This commit is contained in:
2020-12-04 20:06:00 +00:00
parent c103fac27c
commit b771c7f088
4 changed files with 1 additions and 20 deletions

View File

@@ -102,12 +102,8 @@
.items .items-list .item-weapon,
.items .items-list .item-skill,
.items .items-list .item-nor,
<<<<<<< HEAD
.items .items-list .item-defence,
.items .items-list .item-attack {
=======
.items .items-list .item-defence {
>>>>>>> master
line-height: 24px;
padding: 3px 0;
border-bottom: 1px solid #bbb;