From e80ff9b723e36cfb3ed8f27f4633c37d07384add Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Wed, 27 Aug 2014 14:09:15 -0400
Subject: [PATCH] some missing conflict resolution from most recent merge with
 master

---
 gtk2_ardour/ui/audio_time_axis.xml | 1 -
 gtk2_ardour/ui/editor_mixer.xml    | 1 -
 2 files changed, 2 deletions(-)

diff --git a/gtk2_ardour/ui/audio_time_axis.xml b/gtk2_ardour/ui/audio_time_axis.xml
index dddbf9a683..a4782251db 100644
--- a/gtk2_ardour/ui/audio_time_axis.xml
+++ b/gtk2_ardour/ui/audio_time_axis.xml
@@ -3,7 +3,6 @@
 <RouteUI bgnormal="#383838" bgactive="#545454">
 <Vbox>
 <EventBox id="upper_drop_indicator" visible="false" noshowall="true" height="2" bgnormal="#1CA3B3" bgactive="#1CA3B3"/>
->>>>>>> master
   <HBox>
     <VBox>
       <EventBox height="1" bgnormal="#494949" bgactive="#494949"/>
diff --git a/gtk2_ardour/ui/editor_mixer.xml b/gtk2_ardour/ui/editor_mixer.xml
index 484597c6b1..039e97256d 100644
--- a/gtk2_ardour/ui/editor_mixer.xml
+++ b/gtk2_ardour/ui/editor_mixer.xml
@@ -253,7 +253,6 @@
         </VBox>
         <HBox visible="false"
               noshowall="true">
->>>>>>> master
           <Button id="show_sends_button"/>
           <Button id="monitor_disk_button"/>
           <Button id="comment_button"/>