projects
/
salamandradevs.site
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Probando 100% de altura en body
[salamandradevs.site/.git]
/
.gitignore
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)