Revert botched LotFP merge

Lotfp/Lotfp.css

@@ -12,20 +12,7 @@ h3 {
     text-transform: uppercase;
 }
 select {
-<<<<<<< HEAD
-	margin-bottom: 0;
-}
-h3:after {
-    display: inline-block;
-    margin: 0 0 8px 20px;
-    height: 3px;
-    content: " ";
-    text-shadow: none;
-    background-color: #000;
-    width: 80px;
-=======
     margin-bottom: 0;
->>>>>>> Roll20/master
 }
 h3::after, h3::before {
     display: inline-block;
@@ -66,14 +53,8 @@ h3::before {
     overflow: auto;
     margin-bottom: 10px;
 }
-<<<<<<< HEAD
-.sheet-col-1{
-    width: calc(45% - 20px) !important;
-    margin-right: 10px !important;
-=======
 .sheet-col-left {
     width: 48%;
->>>>>>> Roll20/master
 }
 .sheet-col-right {
     width: 51%;
@@ -246,14 +227,6 @@ button[type=roll].sheet-skill-button::before {
 input[type=number].sheet-encumbrance,
 select.sheet-skillvalue {
     width: 39px;
-<<<<<<< HEAD
-}
-/*Weapons*/
-.attr_weapon_title{
-    display: block;
-    float: left;
-=======
->>>>>>> Roll20/master
     text-align: center;
 }
 .sheet-encumbrance-total .sheet-encumbrance {
@@ -411,22 +384,12 @@ input[type=number].sheet-spell-prepared {
 .sheet-rolltemplate-lotfp_check tr:nth-child(even) {
     background-color: #ededed;
 }
-<<<<<<< HEAD
-
-.sheet-rolltemplate-lotfp_check .inlinerollresult  {
-	display: inline-block;
-	min-width: 1.5em;
-	text-align: center;
-	border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
-	background-color: #c5c6c7; /*Cool Gray 6 C*/
-=======
 .sheet-rolltemplate-lotfp_check .inlinerollresult {
     display: inline-block;
     min-width: 1.5em;
     text-align: center;
     border: 2px solid #a7a8aa; /*Cool Gray 6 C*/
     background-color: #c5c6c7; /*Cool Gray 6 C*/
->>>>>>> Roll20/master
 }
 .sheet-rolltemplate-lotfp_check .inlinerollresult.fullcrit {
     background-color: #3FB315;
@@ -444,10 +407,3 @@ input[type=number].sheet-spell-prepared {
     width: 100%;
     max-width: 400px;
 }
-<<<<<<< HEAD
-.sheet-rolltemplate-lotfp_check div{
-	width:100%;
-	max-width:400px;
-}
-=======
->>>>>>> Roll20/master