diff options
| author | Stuart Thackray <stuart.thackray@gmail.com> | 2018-12-11 09:22:15 +0200 |
|---|---|---|
| committer | Stuart Thackray <stuart.thackray@gmail.com> | 2018-12-11 09:22:15 +0200 |
| commit | 4d3eb5604cab8c2320ce119a467b4ca04b60c78a (patch) | |
| tree | 00115939e7fa3687e45c7fd7188f04a509c9773d | |
| parent | 1a26a9a71997f6cd7d8286f7ff30626edaf4f903 (diff) | |
Revert "add rebar.lock to template gitignore"
This reverts commit 8fb8a91130e0e5c239bb837b9adc4ad71e5806b8.
| -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 |