diff options
| author | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 14:47:15 +0800 |
|---|---|---|
| committer | Lin Jen-Shin <godfat@godfat.org> | 2017-04-07 14:47:15 +0800 |
| commit | 38796f56173caa2ed6575a4f60f7bf07ed90af55 (patch) | |
| tree | 0189a4f8b55fae0e9eb5a476656348f72af5d63f /app/controllers/projects/commit_controller.rb | |
| parent | f8fe64a630b2adff8d260c7cc92f89ff8cfd0519 (diff) | |
| download | gitlab-ce-38796f56173caa2ed6575a4f60f7bf07ed90af55.tar.gz | |
Fix bad conflict resolution
Diffstat (limited to 'app/controllers/projects/commit_controller.rb')
0 files changed, 0 insertions, 0 deletions