diff options
| author | Sean McGivern <sean@gitlab.com> | 2019-02-07 16:05:52 +0300 |
|---|---|---|
| committer | Sean McGivern <sean@gitlab.com> | 2019-02-07 16:05:52 +0300 |
| commit | 5fc522ed4fabaedb67e010706336868fb2095122 (patch) | |
| tree | 34abc6ad10b2573569650d28fbf4676dbd402da9 /app | |
| parent | 05033177d7349b5301ac9898a5acd0184b009f55 (diff) | |
| parent | c48dbcf0c0b43886a252d95ad649a157b35135b6 (diff) | |
Merge branch 'ce-version-fix-failing-resolve-conflicts-spec' into 'master'
Update spec/features/merge_request/user_resolves_conflicts_spec.rb
See merge request gitlab-org/gitlab-ce!24996
Diffstat (limited to 'app')
0 files changed, 0 insertions, 0 deletions