Merge branch 'master' of https://github.com/valeriabenetti/roll20-character-sheets

2018-01-19 18:57:29 -05:00
parent cc69655619 b39717224f
commit 59f1264090
1 changed files with 4 additions and 0 deletions
@@ -160,7 +160,11 @@
 }

 .charsheet .sheet-attackbox {
+<<<<<<< HEAD
  width: 40%;
+=======
+   width: 30%;
+>>>>>>> b39717224fd911e1bc1f9f65ce438894a08385ba
 }

 .charsheet .sheet-attackboxsmall {