projects / salamandradevs.site / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c56912d)
Limpiando rebase
authorSalamandraDevs <salamandradevs@gmail.com>
Wed, 25 Jan 2023 21:58:58 +0000 (16:58 -0500)
committerSalamandraDevs <salamandradevs@gmail.com>
Wed, 25 Jan 2023 21:58:58 +0000 (16:58 -0500)
.gitignore patch | blob | history

diff --git a/.gitignore b/.gitignore
index 4488dd3cb07f4d2833a6dfc00fc6936770a44ce9..7bfaec85857cd069f5cc69afd92da32d43808c3c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,4 @@
 *~
 \#*#
 public_html/
-<<<<<<< HEAD
 .hugo_build.lock
-=======
-.hugo_build.lock
->>>>>>> 9b5582b (recreando repositorio)
Unnamed repository; edit this file 'description' to name the repository.