1

static/css/common.css

@@ -21,6 +21,7 @@ div {
 }
 
 <<<<<<< HEAD
+<<<<<<< HEAD
 ul,
 ol {
   list-style: none;
@@ -60,6 +61,8 @@ a:focus {
   position: absolute;
 }
 =======
+=======
+>>>>>>> a58bbc28b511c367a82c847858c8470172463762
 body,ul,ol,li,p,h1,h2,h3,h4,h5,h6,form,fieldset,table,td,img,div{margin:0;padding:0;border:0;font-size: 16px;color: #fff;}
 ul,ol{list-style:none;}
 select,input,img,select{vertical-align:middle;}
@@ -116,5 +119,9 @@ a:hover,a:active,a:focus{color:#c00;text-decoration:underline;}
     padding:3px 20px;
     border-radius: 13px;
     margin-left: 10px
+<<<<<<< HEAD
 }
 >>>>>>> origin/master
+=======
+}
+>>>>>>> a58bbc28b511c367a82c847858c8470172463762