Borrando archivo en conflicto de emacs

diff --git a/.gitignore b/.gitignore
index feb866f7272b5a3b0e0c2dca5a5e68159396f3a0..910c00147feb23b04060d52e0e693ace8e9bcdf8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 *~
+\#*#
 public_html/

diff --git a/themes/droda/layouts/about/#single.html# b/themes/droda/layouts/about/#single.html#
deleted file mode 100644 (file)
index 44f9efa..0000000
--- a/themes/droda/layouts/about/#single.html#
+++ /dev/null
@@ -1,10 +0,0 @@
-{{ "<!-- Layout for about page -->" | safeHTML }}
-{{ define "main" }}
-   {{ partial "menu/sidebar.html" . }}
-   {{ partial "menu/sidebar.html" . }}
-   <main>
-       <div class="about">{{ .Site.title }}</div>
-   </main>
-   {{ partial "footer.html" . }}
-{{ end }}
-cus
\ No newline at end of file