From 37331849549bc1ebe77f43a15f6f55465232c5f0 Mon Sep 17 00:00:00 2001
From: fortinux <marcelo.fortino@gmail.com>
Date: Fri, 30 May 2014 15:29:47 -0300
Subject: [PATCH] change footer

---
 footer.rhtml | 3 ---
 1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/footer.rhtml b/footer.rhtml
index 951609e..cadc466 100644
--- a/footer.rhtml
+++ b/footer.rhtml
@@ -22,13 +22,10 @@
 <ul id="footer-menu">
   <li>Conheça
     <ul>
-<<<<<<< HEAD
       <li><a href="/portal/quem-somos">Quem Somos</a></li>
       <li><a href="/termo-de-uso.html">Termos de Uso</a></li>
-=======
       <li><a href="/sumtec/quem-somos">Quem Somos</a></li>
       <li><a href="/site/terms">Termos de Uso</a></li>
->>>>>>> dbd5185249b4ce7233dc22a759ab87bb4d797292
       <li><a href="/doc">Documentação</a></li>
       <li><a href="/ajuda/fale-conosco">Fale Conosco</a></li>
       <!-- <li><a href="/profile/sumtec/plugin/custom_forms/show/2">Fale Conosco</a></li> -->
--
libgit2 0.21.2