Revert "revolvendo os conflitos"

This reverts commit a69af34, reversing changes made to a378b26.
Interacao-Humano-Computador · Jan 2, 2025 · 385e47a · 385e47a
1 parent e460f8e
commit 385e47a
Showing 1 changed file with 7 additions and 0 deletions.
diff --git a/mkdocs.yml b/mkdocs.yml
@@ -5,6 +5,9 @@
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> parent of a69af34 (revolvendo os conflitos)
 =======
 >>>>>>> parent of a69af34 (revolvendo os conflitos)
 site_name: "Defensoria Pública do Distrito Federal"
@@ -466,8 +469,12 @@ nav:
 #
 # =============================================
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 >>>>>>> parent of 96be7db (peges)
 =======
 >>>>>>> devel
 >>>>>>> parent of a69af34 (revolvendo os conflitos)
+=======
+>>>>>>> devel
+>>>>>>> parent of a69af34 (revolvendo os conflitos)