diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-12-05 19:18:20 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-12-27 15:14:25 -0300 |
| commit | 0aa87bbe13ca74a791bf5c70a12d8e7f6876fd5a (patch) | |
| tree | 969685fa1afcde794cc216edd31030fb06d54559 /lib/api/variables.rb | |
| parent | 351f205c0580e43ace9d5a47e0b923ffb7cda3b8 (diff) | |
| download | gitlab-ce-0aa87bbe13ca74a791bf5c70a12d8e7f6876fd5a.tar.gz | |
Incorporate ConflictsService.ResolveConflicts Gitaly RPC
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions