diff options
| author | Sean McGivern <sean@gitlab.com> | 2016-08-02 14:04:16 +0100 |
|---|---|---|
| committer | Fatih Acet <acetfatih@gmail.com> | 2016-08-12 23:24:46 +0300 |
| commit | 3cc07e7e391a995361bb2523fef5e092570643f3 (patch) | |
| tree | 60bac8be0defedcdc72f3a3d86711f0259f5f29c /lib/gitlab/conflict | |
| parent | 3b84cfdc74e27c5f0b94187f5a15c95e3f292554 (diff) | |
| download | gitlab-ce-3cc07e7e391a995361bb2523fef5e092570643f3.tar.gz | |
Fix resolve_conflicts endpoint
Diffstat (limited to 'lib/gitlab/conflict')
0 files changed, 0 insertions, 0 deletions