Undo merge conflict

1 files changed, 2 insertions, 3 deletions

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index e6efccf..f0017ee 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -40,14 +40,13 @@
       </div>
       <div id="center_column">
         <%= yield :layout %>
-
-        <div id="footer">
-        </div>
       </div>
       <div id="right_column">
         <%= tags %>
         <%= featured_articles %>
       </div>
     </div>
+
+        <div id="footer"> </div>
   </body>
 </html>