diff options
| author | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
|---|---|---|
| committer | Viacheslav V. Kovalev <kovyl2404@gmail.com> | 2015-05-01 00:23:51 +0300 |
| commit | 33736f32a9a8bfd30711270e8f1376280915d697 (patch) | |
| tree | 11924915352287650253a73ae7254af241c07625 /.gitignore | |
| parent | 29a855d31c7fe7fd7504f5d0ec95c9a55e27276f (diff) | |
| parent | 7645a1118f0e5cdc27e010905f5072021559ddfd (diff) | |
Merge branch 'master' into app-discover-profile-duplication
Conflicts:
test/rebar_profiles_SUITE.erl
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -1,8 +1,9 @@ +rebar3 +_build .depsolver_plt *.beam test/*_data logs -rebar3 /rebar *~ *.orig @@ -13,6 +14,5 @@ rebar3 /.eunit /deps /.rebar -rebar.lock priv/templates/*.dtl.erl ebin |