diff options
| author | Alejandro RodrÃguez <alejorro70@gmail.com> | 2017-12-27 16:49:05 -0300 |
|---|---|---|
| committer | Alejandro RodrÃguez <alejorro70@gmail.com> | 2018-01-02 16:22:02 -0300 |
| commit | 65e3a1e9e9a316a2bbbcd49e22b858b8b1bd9890 (patch) | |
| tree | 37aed42681aad3d05aa646c05140a712bd4d5beb /lib/api/variables.rb | |
| parent | 0aa87bbe13ca74a791bf5c70a12d8e7f6876fd5a (diff) | |
| download | gitlab-ce-65e3a1e9e9a316a2bbbcd49e22b858b8b1bd9890.tar.gz | |
Simplify conflict resolution interface and codegitaly-conflict-resolver
- Add a Gitlab::Git::Conflict::Resolution class to encapsulate
resolution data
- Simplify conflict file collection assembly
Diffstat (limited to 'lib/api/variables.rb')
0 files changed, 0 insertions, 0 deletions