diff options
Diffstat (limited to 'priv/templates/gitignore')
| -rw-r--r-- | priv/templates/gitignore | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/priv/templates/gitignore b/priv/templates/gitignore index 617aab8..9d7e9c5 100644 --- a/priv/templates/gitignore +++ b/priv/templates/gitignore @@ -13,4 +13,11 @@ erl_crash.dump .rebar logs _build +<<<<<<< HEAD rebar.lock +======= +.idea +*.iml +rebar3.crashdump +*~ +>>>>>>> upstream/master |