From 314971692efe76087f30b188dba84908d398feb8 Mon Sep 17 00:00:00 2001
From: Leandro Nunes dos Santos <leandronunes@gmail.com>
Date: Mon, 30 Jun 2014 17:19:07 -0300
Subject: [PATCH] fixing wrong merge conflit resolution

---
 app/views/layouts/_user.html.erb | 1 +
 1 file changed, 1 insertion(+), 0 deletions(-)

diff --git a/app/views/layouts/_user.html.erb b/app/views/layouts/_user.html.erb
index beb8064..d9521e1 100644
--- a/app/views/layouts/_user.html.erb
+++ b/app/views/layouts/_user.html.erb
@@ -19,6 +19,7 @@
     <% end %>
 
   </span>
+  <% end %>
   <form action="/search/articles" id="top-search" class="search_form clean" method="get">
     <input name="query" size="15" title="<%=_('Search...')%>" onfocus="this.form.className='focused';" onblur="this.form.className=''" />
     <div><%=_('Press <strong>Enter</strong> to send the search query.')%></div>
--
libgit2 0.21.2