trens

2024-07-03 14:29:31 -03:00 · 2024-07-03 14:29:31 -03:00 · 8221dac11c
parent bedb20fc72
commit 8221dac11c
2 changed files with 0 additions and 11 deletions
--- a/_includes/header.html
+++ b/_includes/header.html
@ -60,15 +60,9 @@
                <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>
--- a/collections/_trens/git.md
+++ b/collections/_trens/git.md
@ -1,11 +1,6 @@
 ---
 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
 ---