summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFred Hebert <mononcqc@ferd.ca>2018-11-01 09:34:27 -0400
committerGitHub <noreply@github.com>2018-11-01 09:34:27 -0400
commit83d01b52493b2397b09008c0a4f68acaaaee3d23 (patch)
tree3a08ce5eb2087354541a20161f3c7f071dd34eb5
parent0f6f1630176da37af5971a6fa51f57c0733f949d (diff)
parentf0826929de675d04f8cb81afa0f3e7a879984446 (diff)
Merge pull request #1929 from Raphexion/raphexion/ignore-emacs-temp-files
templates/gitignore ignore emacs temp files
-rw-r--r--THANKS1
-rw-r--r--priv/templates/gitignore1
2 files changed, 2 insertions, 0 deletions
diff --git a/THANKS b/THANKS
index d6e3869..e4bb872 100644
--- a/THANKS
+++ b/THANKS
@@ -140,3 +140,4 @@ Heinz N. Gies
Roberto Aloi
Andrew McRobb
Drew Varner
+Niklas Johansson
diff --git a/priv/templates/gitignore b/priv/templates/gitignore
index 40ca652..f1c4554 100644
--- a/priv/templates/gitignore
+++ b/priv/templates/gitignore
@@ -16,3 +16,4 @@ _build
.idea
*.iml
rebar3.crashdump
+*~