v0.0.4 fixes

2020-12-04 21:01:28 +01:00
parent a496eca37f
commit e631883a44
4 changed files with 2 additions and 15 deletions
--- a/styles/items.css
+++ b/styles/items.css
@@ -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;