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