Commit 9c23c238 authored by Sean McGivern's avatar Sean McGivern

Merge branch 'gitignore-rej' into 'master'

Added .rej files to gitignore

See merge request gitlab-org/gitlab-ce!16429
parents 46ad550a a022e8f1
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
*.swp *.swp
*.mo *.mo
*.edit.po *.edit.po
*.rej
.DS_Store .DS_Store
.bundle .bundle
.chef .chef
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment