diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 17:22:45 +0200 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2015-08-06 17:22:45 +0200 |
| commit | ab6aa8a48bbee2b62a2ddc0a2a7807109d814f0a (patch) | |
| tree | 007f5a29300ad7a1e8c4e0a0ec7ff7c032d8b04c /lib/api/files.rb | |
| parent | 912233ecd31136c302eeea63c7e2a9ca36ba742b (diff) | |
| download | gitlab-ce-ab6aa8a48bbee2b62a2ddc0a2a7807109d814f0a.tar.gz | |
Split merge conflict messages on 2 linesnicer-merge-conflicts-widget
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Diffstat (limited to 'lib/api/files.rb')
0 files changed, 0 insertions, 0 deletions