diff options
author | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-12 13:16:15 +0000 |
---|---|---|
committer | Sean McGivern <sean@mcgivern.me.uk> | 2018-01-12 13:16:15 +0000 |
commit | 9c23c238ab76dc4d6a1725cfe7b8e5bcac146149 (patch) | |
tree | f73f6e14e137e70460acdea5bc83c522c6dc471c | |
parent | 46ad550a0a6bd332e3bd16a06ce21e0de1b46cd3 (diff) | |
parent | a022e8f192c5b2dc83f41a36a04504e146d75d17 (diff) | |
download | gitlab-ce-9c23c238ab76dc4d6a1725cfe7b8e5bcac146149.tar.gz |
Merge branch 'gitignore-rej' into 'master'
Added .rej files to gitignore
See merge request gitlab-org/gitlab-ce!16429
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 4933575332b..2004c2a09b4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,6 +2,7 @@ *.swp *.mo *.edit.po +*.rej .DS_Store .bundle .chef |