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