Fixed conflicts in templates.

templates/history/options.mako

@@ -16,14 +16,8 @@
     %if len( history.active_datasets ) > 0:
         <li><a href="${h.url_for('/history_new')}">Create</a> a new empty history</li>
     %endif
-<<<<<<< local
     <li><a href="${h.url_for( controller='workflow', action='build_from_current_history' )}">Construct workflow</a> from the current history</li>
-=======
-    %if app.config.enable_beta_features:
-        <li><a href="${h.url_for( controller='workflow', action='build_from_current_history' )}">Construct workflow</a> from the current history</li>
-    %endif
     <li><a href="${h.url_for( action='history_set_default_permitted_actions' )}">Change default permitted actions</a> for the current history</li>
->>>>>>> other
     <li><a href="${h.url_for( action='history_share' )}" target="galaxy_main">Share</a> current history</div>
 %endif
     <li><a href="${h.url_for( action='history_delete', id=history.id )}" confirm="Are you sure you want to delete the current history?">Delete</a> current history</div>

templates/root/tool_menu.mako

@@ -82,7 +82,6 @@
 ## at least some workflows will appear here (the user should be able to
 ## configure which of their stored workflows appear in the tools menu). 
 
-<<<<<<< local
 <div class="toolSectionPad"></div>
 <div class="toolSectionPad"></div>
 <div class="toolSectionTitle" id="title_XXinternalXXworkflow">
@@ -92,16 +91,7 @@
   <div class="toolSectionBg">
         <div class="toolTitle">
             <a href="${h.url_for( controller='workflow', action='index' )}" target="galaxy_main">Manage</a> workflows
-=======
-%if app.config.enable_beta_features:
-    %if t.user and t.user.stored_workflow_menu_entries:
-        <div class="toolSectionPad"></div>
-        <div class="toolSectionPad"></div>
-        <div class="toolSectionTitle" id="title_XXinternalXXworkflow">
-          <span>Your workflows</span>
->>>>>>> other
         </div>
-<<<<<<< local
         %if t.user:
             %for m in t.user.stored_workflow_menu_entries:
                 <div class="toolTitle">
@@ -111,19 +101,6 @@
         %endif
   </div>
 </div>
-=======
-        <div id="XXinternalXXworkflow" class="toolSectionBody">
-            <div class="toolSectionBg">        
-                %for m in t.user.stored_workflow_menu_entries:
-                    <div class="toolTitle">
-                        <a href="${h.url_for( controller='workflow', action='run', id=trans.security.encode_id(m.stored_workflow_id) )}" target="galaxy_main">${m.stored_workflow.name}</a>
-                    </div>
-                %endfor
-            </div>
-        </div>
-    %endif
-%endif
->>>>>>> other
 
 </div>
 
@@ -133,4 +110,4 @@
 
 </body>
 
-</html>
+</html>