Removing taint from merge conflict

coral-erm · Aug 26, 2020 · 6a9c6fd · 6a9c6fd
1 parent 984a028
commit 6a9c6fd
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/resources/css/style.css b/resources/css/style.css
@@ -3282,7 +3282,6 @@ input#archiveInd {
     margin-bottom: 10px;
 }
 
-<<<<<<< HEAD
 /*--- Icons align in ProductsDetails ---*/
 .alignIcons{
 	display: flex;