diff options
author | Rémy Coutable <remy@rymai.me> | 2017-08-01 15:06:56 +0300 |
---|---|---|
committer | Rémy Coutable <remy@rymai.me> | 2017-08-01 15:06:56 +0300 |
commit | fb1baaa7864c05668a04053204bfff4772830627 (patch) | |
tree | 918d1cb291552aaf4b98a50eb65bcb7a37ff422a /spec/controllers/projects/branches_controller_spec.rb | |
parent | 0bbf006454e47cb0411a0d035e45cda39739ca6f (diff) | |
parent | 913aca1db9b1bbf90f3490262c4429d95fbc517c (diff) |
Merge branch '35627-lint-for-conflict' into 'master'
Make sure we didn't commit conflicts
Closes #35627
See merge request !13141
Diffstat (limited to 'spec/controllers/projects/branches_controller_spec.rb')
0 files changed, 0 insertions, 0 deletions