From 7b8bfddca68dfec6573f83163ef3f83d9b6455f7 Mon Sep 17 00:00:00 2001
From: Paul Davis <paul@linuxaudiosystems.com>
Date: Tue, 13 Nov 2007 01:55:56 +0000
Subject: [PATCH] fixed bad merge

git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf
---
 gtk2_ardour/ardour.menus | 21 ---------------------
 1 file changed, 21 deletions(-)

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 54060c06aa..0c374bbd67 100644
--- a/gtk2_ardour/ardour.menus
+++ b/gtk2_ardour/ardour.menus
@@ -92,27 +92,6 @@
     	           <menuitem action='edit-cursor-to-range-start'/>
 	           <menuitem action='edit-cursor-to-range-end'/>
 	       </menu>
-<<<<<<< .working
-	       <menu action='RegionEditOps'>
-                   <menuitem action='crop'/>
-                   <menuitem action='duplicate-region'/>
-                   <menuitem action='insert-region'/>
-               	   <menuitem action='normalize-region'/>
-                   <separator/>       
-	           <menuitem action="nudge-forward"/>
-         	   <menuitem action="nudge-next-forward"/>
-	           <menuitem action="nudge-backward"/>
-        	   <menuitem action="nudge-next-backward"/>
-                   <separator/>       
-		   <menuitem action='align-regions-start'/>
-		   <menuitem action='align-regions-start-relative'/>
-		   <menuitem action='align-regions-end'/>
-		   <menuitem action='align-regions-end-relative'/>
-		   <menuitem action='align-regions-sync'/>
-		   <menuitem action='align-regions-sync-relative'/>
-	       </menu>
-=======
->>>>>>> .merge-right.r2626
 	       <menu name='KeyMouse Actions' action='KeyMouse Actions'>
 	       		<menuitem action='audition-at-mouse'/>
                		<menuitem action='brush-at-mouse'/>