From ae394fb9b5781674b6226e9e728bd550a0dafef0 Mon Sep 17 00:00:00 2001
From: John Mitchell <jlmitch5@ncsu.edu>
Date: Tue, 3 May 2016 13:05:49 -0400
Subject: [PATCH] fixed global colors

---
 awx/ui/client/src/dashboard/dashboard.block.less | 1 -
 1 file changed, 1 deletion(-)

diff --git a/awx/ui/client/src/dashboard/dashboard.block.less b/awx/ui/client/src/dashboard/dashboard.block.less
index 151286d9f8..75d9525040 100644
--- a/awx/ui/client/src/dashboard/dashboard.block.less
+++ b/awx/ui/client/src/dashboard/dashboard.block.less
@@ -1,5 +1,4 @@
 /** @define Dashboard */
-<<<<<<< HEAD
 @import "../shared/branding/colors.default.less";
 
 .Dashboard {