Trens

_includes/header.html

@@ -60,9 +60,15 @@
                 <div class="navbar-dropdown">
                     {% assign trens_files = site.trens %}
                     {% for trens_file in trens_files %}
+<<<<<<< HEAD
                         <a class="navbar-item" href="{{ trens_file.url }}">
                             {{ trens_file.name }}
                         </a>
+=======
+                            <a class="navbar-item" href="{{ trens_file.fix_url }}">
+                                {{ trens_file.title }}
+                            </a>
+>>>>>>> 61f4a73 (Trens)
                     {% endfor %}
                 </div>
             </div>

collections/_trens/git.md

@@ -1,6 +1,11 @@
 ---
 layout: default
+<<<<<<< HEAD
 title: Gitea
 url_Git: https://alice.ufsj.edu.br/git
+=======
+title: Git
+fix_url: https://alice.ufsj.edu.br/git
+>>>>>>> 61f4a73 (Trens)
 displaymenu: true
 ---