diff options
| author | Robert | 2017-10-11 16:18:09 +0200 |
|---|---|---|
| committer | Robert | 2017-10-11 16:18:09 +0200 |
| commit | ada25199aa9b68c72725e8ec22b89e29d446ce87 (patch) | |
| tree | a4bae025cbfd82d4459be27b71f2bbde89df5e07 /.gitignore | |
| parent | f6a8cbefbc291eff9f85c1fd7ad4e2c90fa3452f (diff) | |
| parent | 65cbdcc98f247b6e5bc41b74495aa140ddb310ab (diff) | |
| download | chouette-core-ada25199aa9b68c72725e8ec22b89e29d446ce87.tar.bz2 | |
Conflict resolved
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index ed0050afa..a950559ef 100644 --- a/.gitignore +++ b/.gitignore @@ -30,7 +30,6 @@ coverage # IDE .idea -bin/ # Ignore uploaded files /public/uploads @@ -43,6 +42,7 @@ bin/ /bin/rake /bin/rails /bin/rspec +/bin/spring # FIXME Ignore ./spec/services/zip_service/regression_4273_spec.rb files /spec/fixtures/target_*.zip/public/packs |