diff options
| author | Stuart Thackray <stuart.thackray@gmail.com> | 2018-12-11 08:53:29 +0200 |
|---|---|---|
| committer | Stuart Thackray <stuart.thackray@gmail.com> | 2018-12-11 08:53:29 +0200 |
| commit | ebfa797c1f5d038b99beaf658757d974412a15c7 (patch) | |
| tree | 9765880a7f0119c265d85f8bac7afea8d9542080 /priv/templates/gitignore | |
| parent | 71187514dabdd94aa333495d92df84a2e750099f (diff) | |
| parent | 8e28561d4e14ea85d42d17ab5a0f17f5f1c696d2 (diff) | |
Update from Upstream
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 |