Merge branch 'gitignore-rej' into 'master'

Added .rej files to gitignore See merge request gitlab-org/gitlab-ce!16429

Merge branch 'gitignore-rej' into 'master'
9c23c238 · Sean McGivern · 46ad550a · a022e8f1 · 9c23c238
Commit 9c23c238 authored Jan 12, 2018 by Sean McGivern
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

.gitignore .gitignore +1 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
 *.swp
 *.mo
 *.edit.po
+*.rej
 .DS_Store
 .bundle
 .chef