fixed bad merge

git-svn-id: svn://localhost/ardour2/trunk@2632 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus
index 54060c06aa57b41a6ba77e55cdee0a26f5e7c623..0c374bbd6730cd698e0a034eedf5697da40d92eb 100644 (file)
--- 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'/>