Clean

status-im · Aug 23, 2022 · ca9345f · ca9345f
1 parent b8d2aa1
commit ca9345f
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/src/quo2/foundations/colors.cljs b/src/quo2/foundations/colors.cljs
@@ -183,7 +183,6 @@
 (def info-50-opa-30 (alpha info-50 0.3))
 (def info-50-opa-40 (alpha info-50 0.4))
 
-<<<<<<< HEAD
 ;; Customization
 (def purple-50 "#8661C1")
 (def purple-60 "#5E478C")