fixed conflic

2017-10-27 13:25:13 +06:30
parent 188d091884 c8ee056312
commit b4005efa1b
9 changed files with 22 additions and 15 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -57,7 +57,6 @@
            </p>
        <% end %>       
        <%= yield %>     
-    </section>
+    </section>        
 </body>
-
 </html>