fixed conflict

2017-06-04 13:12:02 +06:30
parent fa34d1db8f 89cbb59e7c
commit aa295c3a12
23 changed files with 250 additions and 43 deletions
--- a/app/views/settings/menu_item_instances/edit.html.erb
+++ b/app/views/settings/menu_item_instances/edit.html.erb
@@ -4,6 +4,7 @@
 		<div class="page-header">
 		 <ul class="breadcrumb">
 		   	<li><a href="<%= root_path %>">Home</a></li>
+
 			<li><a href="<%= settings_menu_category_simple_menu_item_path(@category,@item) %>">Menu Category</a></li>
 			<li>Menu Item</li>
 			<li>Menu Item Instances</li>
@@ -11,4 +12,5 @@
 		 </ul>
 		</div>
    <%= render 'form', settings_menu_item_menu_item_instances: @settings_menu_item_instances %>
+
 </div>