Merge conflict fix

2020-12-04 20:49:58 +01:00
parent 1a24e7facf 2e389704ea
commit a496eca37f
4 changed files with 19 additions and 0 deletions
--- a/styles/items.css
+++ b/styles/items.css
@@ -102,8 +102,12 @@
 .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;