Commit 37331849549bc1ebe77f43a15f6f55465232c5f0
1 parent
1c0df3f5
Exists in
master
change footer
Showing
1 changed file
with
0 additions
and
3 deletions
Show diff stats
footer.rhtml
| ... | ... | @@ -22,13 +22,10 @@ |
| 22 | 22 | <ul id="footer-menu"> |
| 23 | 23 | <li>Conheça |
| 24 | 24 | <ul> |
| 25 | -<<<<<<< HEAD | |
| 26 | 25 | <li><a href="/portal/quem-somos">Quem Somos</a></li> |
| 27 | 26 | <li><a href="/termo-de-uso.html">Termos de Uso</a></li> |
| 28 | -======= | |
| 29 | 27 | <li><a href="/sumtec/quem-somos">Quem Somos</a></li> |
| 30 | 28 | <li><a href="/site/terms">Termos de Uso</a></li> |
| 31 | ->>>>>>> dbd5185249b4ce7233dc22a759ab87bb4d797292 | |
| 32 | 29 | <li><a href="/doc">Documentação</a></li> |
| 33 | 30 | <li><a href="/ajuda/fale-conosco">Fale Conosco</a></li> |
| 34 | 31 | <!-- <li><a href="/profile/sumtec/plugin/custom_forms/show/2">Fale Conosco</a></li> --> | ... | ... |