Remove git lines

Remove git lines

diff --git a/common/common.scss b/common/common.scss
index 52488bc..451d21c 100644
--- a/common/common.scss
+++ b/common/common.scss
@@ -229,13 +229,10 @@
 .topic-thumbnails-minimal {
   margin-top: 5px;
   
-<<<<<<< HEAD
   .topic-thumbnail-likes {
     display: inline;
   }
   
-=======
->>>>>>> 80e63813acddf67b119f9d0055f0e334e6940a13
   thead,
   tr.topic-list-item-separator {
     display: none;

GitHub sha: b91ef9c7597be3ca15079cced23335579db57e25