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

Fix Conflict

Browse Source
This commit is contained in:
Phyo
2017-08-16 18:38:41 +06:30
parent fc2927b341 4fc748e877
commit 0138ae2efa
13 changed files with 220 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/views/layouts/_header.html.erb
View File

@@ -29,7 +29,8 @@
<hr class="hr_advance" />
<li><%= link_to "Accounts", settings_accounts_path, :tabindex =>"-1" %></li>
<hr class="hr_advance" />
<li><%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %></li>
<li><%= link_to "Promotion", settings_promotions_path, :tabindex =>"-1" %></li>]
<li><%= link_to "Products", settings_products_path, :tabindex =>"-1" %></li>
</ul>
</li>