app/models/repository.rb · 340a5e70a24089d0cc1523d51e0bd9e070af06ab · Forest Godfrey / gitlab-ce · GitLab

BigW Consortium Gitlab

Blame History Permalink

Merge branch 'fix-conflict-highlighting' into 'master' · 202ab628
Douwe Maan authored Nov 20, 2017
```
Fix conflict highlighting

See merge request gitlab-org/gitlab-ce!15463
```
202ab628

repository.rb 30.7 KB