resolviendo conflicto para rebase

OdairTrujillo · Mar 8, 2023 · 10ee526 · 10ee526
1 parent e563185
commit 10ee526
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -2,4 +2,8 @@
 \#*#
 public_html/
 .hugo_build.lock
-.idea/
+<<<<<<< HEAD
+.idea/
+=======
+.idea/
+>>>>>>> c7947e0 (borrando articulo descartado)