From b6ec55a31b0c7392d9feb6cfbdf02e60207cd458 Mon Sep 17 00:00:00 2001
From: Dustin Falgout <dustin@falgout.us>
Date: Mon, 26 Oct 2015 09:40:23 -0500
Subject: [PATCH] cleanup after aborted merge

---
 CREDITS               |  1 +
 openbox-3/themerc     | 26 +++-----------------------
 xfce-notify-4.0/gtkrc |  6 ++----
 3 files changed, 6 insertions(+), 27 deletions(-)

diff --git a/CREDITS b/CREDITS
index ce26794c5..18b4d94b6 100755
--- a/CREDITS
+++ b/CREDITS
@@ -2,3 +2,4 @@ Simon Steinbeiß <simon.steinbeiss@univie.ac.at>
 Joern Konopka <cldx3000@googlemail.com>
 Georgi Karavasilev <motorslav@gmail.com>
 David Barr <dpbarr@gmail.com>
+Dustin Falgout <dustin@antergos.com>
diff --git a/openbox-3/themerc b/openbox-3/themerc
index 488fee5e3..b18e344e8 100755
--- a/openbox-3/themerc
+++ b/openbox-3/themerc
@@ -17,13 +17,9 @@ menu.items.text.color: #eeeeee
 menu.items.disabled.text.color: #888888
 
 menu.items.active.bg: flat solid
-<<<<<<< HEAD
-menu.items.active.bg.color: #f06860
-menu.items.active.text.color: #ffffff
-=======
 menu.items.active.bg.color: #1a80b6
 menu.items.active.text.color: #f9f9f9
->>>>>>> origin/frost_sass
+
 
 menu.separator.color: #262626
 menu.separator.width: 1
@@ -53,13 +49,9 @@ window.active.button.unpressed.bg.color: #333333
 window.active.button.unpressed.image.color: #eeeeee
 
 window.active.button.pressed.bg: flat solid
-<<<<<<< HEAD
-window.active.button.pressed.bg.color: #333333
-window.active.button.pressed.image.color: #f06860
-=======
+
 window.active.button.pressed.bg.color: #2d2d2d
 window.active.button.pressed.image.color: #1a80b6
->>>>>>> origin/frost_sass
 
 window.active.button.disabled.bg: flat solid
 window.active.button.disabled.bg.color: #333333
@@ -88,13 +80,9 @@ window.inactive.button.unpressed.bg.color: #333333
 window.inactive.button.unpressed.image.color: #888888
 
 window.inactive.button.pressed.bg: flat solid
-<<<<<<< HEAD
-window.inactive.button.pressed.bg.color: #333333
-window.inactive.button.pressed.image.color: #f06860
-=======
 window.inactive.button.pressed.bg.color: #2d2d2d
 window.inactive.button.pressed.image.color: #1a80b6
->>>>>>> origin/frost_sass
+
 
 window.inactive.button.disabled.bg: flat solid
 window.inactive.button.disabled.bg.color: #333333
@@ -112,11 +100,7 @@ osd.label.bg.color: #333333
 osd.label.text.color: #eeeeee
 
 osd.hilight.bg: flat solid
-<<<<<<< HEAD
-osd.hilight.bg.color: #f06860
-=======
 osd.hilight.bg.color: #1a80b6
->>>>>>> origin/frost_sass
 
 osd.unhilight.bg: flat solid
 osd.unhilight.bg.color: #888888
@@ -133,11 +117,7 @@ osd.button.focused.bg: flat solid border
 osd.button.focused.bg.color: #303030
 osd.button.focused.*.border.color: #1e1e1e
 
-<<<<<<< HEAD
-osd.button.focused.box.color: #f06860
-=======
 osd.button.focused.box.color: #1a80b6
->>>>>>> origin/frost_sass
 
 
 # Fonts
diff --git a/xfce-notify-4.0/gtkrc b/xfce-notify-4.0/gtkrc
index c5392e160..16246d3fe 100755
--- a/xfce-notify-4.0/gtkrc
+++ b/xfce-notify-4.0/gtkrc
@@ -27,11 +27,9 @@ style "notify-button" {
 }
 
 style "notify-text" {
-<<<<<<< HEAD
-    GtkWidget::link-color = "#f0544c"
-=======
+
     GtkWidget::link-color = "#1a80b6"
->>>>>>> origin/frost_sass
+
 
     fg[NORMAL] = "#f9f9f9"
     fg[PRELIGHT] = "#f9f9f9"