From a0645e3d035752b7d708964dba341f8b723adfae Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Thu, 5 May 2016 16:24:17 -0400 Subject: [PATCH] removed head tag --- awx/ui/client/src/shared/branding/colors.default.less | 1 - 1 file changed, 1 deletion(-) diff --git a/awx/ui/client/src/shared/branding/colors.default.less b/awx/ui/client/src/shared/branding/colors.default.less index 7ee5f8bc4d..2e986fdb9f 100644 --- a/awx/ui/client/src/shared/branding/colors.default.less +++ b/awx/ui/client/src/shared/branding/colors.default.less @@ -8,7 +8,6 @@ @default-bg: #FFFFFF; // also selected btn txt @default-secondary-bg: #FCFCFC; // page/input field bg, just adds depth @default-tertiary-bg: #FAFAFA; // hover bg, alt-list -<<<<<<< HEAD @default-err: #D9534F; @default-err-hov: #C9302C; @default-succ: #5CB85C;