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

4
app/views/settings/zones/index.html.erb
View File

@@ -36,8 +36,8 @@
<td><%= settings_zone.created_by %></td>
<% end %>
<td>
<%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-lg waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-lg waves-effect' %>
<%= link_to t("views.btn.show"), settings_zone_path(settings_zone),:class => 'btn btn-info btn-sm waves-effect' %>
<%= link_to t("views.btn.edit"), edit_settings_zone_path(settings_zone),:class => 'btn btn-primary btn-sm waves-effect' %>
</td>
</tr>
<% end %>