Fix merge issue

arj03 · Feb 4, 2021 · 658b3f4 · 658b3f4
1 parent 8fac20b
commit 658b3f4
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/css/main.css b/css/main.css
@@ -287,7 +287,6 @@ body, html {
   background-color: #6c6;
 }
 
-<<<<<<< HEAD
 #channels ul.groupMembers
 {
   list-style: none;