fixed conflict

This commit is contained in:
Nweni
2017-06-12 13:27:33 +06:30
5 changed files with 34 additions and 14 deletions

View File

@@ -0,0 +1,3 @@
<div class="row">
<%= @hi %>
</div>