Fix conflicted layout file

MonoBrasil · Sep 6, 2016 · bbea8aa · bbea8aa
1 parent dbb7f12
commit bbea8aa
Showing 1 changed file with 5 additions and 13 deletions.
diff --git a/_layouts/base.html b/_layouts/base.html
@@ -154,20 +154,12 @@ <h1><a href="/"><img alt="Mono Logo" src="/images/mono-gorilla.svg" onerror="thi
           <section class="top-bar-section">
             <!-- Right Nav Section -->
             <ul class="right">
-<<<<<<< HEAD
-              <li {% if page.navgroup == "home" %}class="active"{% endif %}><a href="/"><i class="fa fa-home"></i> Início</a></li>
-              <li {% if page.navgroup == "Brasil" %}class="active"{% endif %}><a href="/Brasil"><i class="fa fa-globe"></i> <span style="color:chartreuse">B</span><span style="color:yellow">r</span><span style="color:chartreuse">a</span><span style="color:yellow">s</span><span style="color:chartreuse">i</span><span style="color:yellow">l</span></a></li>
-              <li {% if page.navgroup == "download" %}class="active"{% endif %}><a href="/download/"><i class="fa fa-download"></i> Download</a></li>
-              <li {% if page.navgroup == "docs" %}class="active"{% endif %}><a href="/docs/"><i class="fa fa-book"></i> Documentação</a></li>
-              <li {% if page.navgroup == "news" %}class="active"{% endif %}><a href="/news/"><i class="fa fa-bullhorn"></i> Novidades</a></li>
-              <li {% if page.navgroup == "community" %}class="active"{% endif %}><a href="/community/"><i class="fa fa-github"></i> Communidade</a></li>
-=======
-              <li {% if page.navgroup == "home" or layout.navgroup == "home" %}class="active"{% endif %}><a href="/"><i class="fa fa-home"></i> Home</a></li>
+              <li {% if page.navgroup == "home" or layout.navgroup == "home" %}class="active"{% endif %}><a href="/"><i class="fa fa-home"></i> Início</a></li>
+              <li {% if page.navgroup == "Brasil"  or layout.navgroup == "Brasil" %}class="active"{% endif %}><a href="/Brasil"><i class="fa fa-globe"></i> <span style="color:chartreuse">B</span><span style="color:yellow">r</span><span style="color:chartreuse">a</span><span style="color:yellow">s</span><span style="color:chartreuse">i</span><span style="color:yellow">l</span></a></li>
               <li {% if page.navgroup == "download" or layout.navgroup == "download" %}class="active"{% endif %}><a href="/download/"><i class="fa fa-download"></i> Download</a></li>
-              <li {% if page.navgroup == "docs" or layout.navgroup == "docs" %}class="active"{% endif %}><a href="/docs/"><i class="fa fa-book"></i> Documentation</a></li>
-              <li {% if page.navgroup == "news" or layout.navgroup == "news" %}class="active"{% endif %}><a href="/news/"><i class="fa fa-bullhorn"></i> News</a></li>
-              <li {% if page.navgroup == "community" or layout.navgroup == "community" %}class="active"{% endif %}><a href="/community/"><i class="fa fa-github"></i> Community</a></li>
->>>>>>> b3061d82ccb7ad3bc4b30a4aa727bf34fa8a3e9d
+              <li {% if page.navgroup == "docs" or layout.navgroup == "docs" %}class="active"{% endif %}><a href="/docs/"><i class="fa fa-book"></i> Documentação</a></li>
+              <li {% if page.navgroup == "news" or layout.navgroup == "news" %}class="active"{% endif %}><a href="/news/"><i class="fa fa-bullhorn"></i> Novidades</a></li>
+              <li {% if page.navgroup == "community" or layout.navgroup == "community" %}class="active"{% endif %}><a href="/community/"><i class="fa fa-github"></i> Communidade</a></li>
               <li class="has-form">
                 <form id="header-searchform" action="https://www.google.com/search" method="get">
 				<div class="row collapse">