chat css

5 years ago · e102ec04ed
parent 6528c18737
commit e102ec04ed
1 changed files with 0 additions and 4 deletions
--- a/12/style.css
+++ b/12/style.css
@ -835,16 +835,12 @@ filter: invert(1);
  background-color:;
  color:#6dc82a;
  float: left;
-<<<<<<< HEAD
  font-size: 34px;
  font-style: italic;
- 
-=======
 }

 #table_content_06{
  width:35%;
->>>>>>> bdec260680cb934f1a5a8645100ccb4852c29a96
 }

 #table_content_06 >ul {