summaryrefslogtreecommitdiff
path: root/rubocop
diff options
context:
space:
mode:
authorLin Jen-Shin (godfat) <godfat@godfat.org>2017-08-01 12:06:56 +0000
committerRémy Coutable <remy@rymai.me>2017-08-01 12:06:56 +0000
commit913aca1db9b1bbf90f3490262c4429d95fbc517c (patch)
tree918d1cb291552aaf4b98a50eb65bcb7a37ff422a /rubocop
parent0bbf006454e47cb0411a0d035e45cda39739ca6f (diff)
downloadgitlab-ce-913aca1db9b1bbf90f3490262c4429d95fbc517c.tar.gz
Make sure we didn't commit conflicts
Diffstat (limited to 'rubocop')
0 files changed, 0 insertions, 0 deletions