Merge branch 'gitignore-rej' into 'master'

Added .rej files to gitignore

See merge request gitlab-org/gitlab-ce!16429
This commit is contained in:
Sean McGivern 2018-01-12 13:16:15 +00:00
commit 9c23c238ab

1
.gitignore vendored
View file

@ -2,6 +2,7 @@
*.swp
*.mo
*.edit.po
*.rej
.DS_Store
.bundle
.chef