fixing conflicts [#6]

2015-07-16 21:29:44 +02:00
parent e88832b5a3 f09f7a17c2
commit 75f1638cd6
23 changed files with 446 additions and 4 deletions
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -11,7 +11,7 @@
    <%= javascript_include_tag "application", 'data-turbolinks-track' => true %>
    <%= csrf_meta_tags %>
  </head>
-  <body>
+  <body style="margin-left:50px">
    <p class="alert"><%= notice %></p>
    <p class="alert"><%= alert %></p> 
    <%= yield %>