git_admin/sx-fc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove conflict text

Browse Source
This commit is contained in:
phyusin
2017-10-25 16:53:22 +06:30
parent 193ddc2486 fa5b544416
commit 98334531b2
137 changed files with 1952 additions and 1463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/views/settings/menus/index.html.erb
View File

@@ -12,11 +12,12 @@
<br><br>
<div class="card">
<ul class="list-group">
<li class="list-group-item"><%= link_to 'Menu ', settings_menus_path %></li>
<li class="list-group-item"><%= link_to 'Menu Categories', settings_menu_categories_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Menu Item', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Item Set', settings_item_sets_path %></li>
<!-- <li class="list-group-item"><%= link_to 'Simple Menu', dashboard_path %></li>
<li class="list-group-item"><%= link_to 'Set Menu', dashboard_path %></li> -->
<li class="list-group-item"><%= link_to 'Items Attributes', settings_menu_item_attributes_path %></li>
<li class="list-group-item"><%= link_to 'Items Options', settings_menu_item_options_path %></li>
</ul>
</div>
</div>