diff options
| author | Douwe Maan <douwe@gitlab.com> | 2017-11-20 10:17:43 +0000 |
|---|---|---|
| committer | Douwe Maan <douwe@gitlab.com> | 2017-11-20 10:17:43 +0000 |
| commit | 202ab62874bb3d828ab48017550660d461e8cf6b (patch) | |
| tree | be7622cfb619b58ca58e0b7c5d172af4eb5df0fd /db/schema.rb | |
| parent | 77350d961d896974df82792ff1529a829e120eb6 (diff) | |
| parent | 64a9e53bd16092e869f88e42a3e69f3f4ba0a23e (diff) | |
| download | gitlab-ce-202ab62874bb3d828ab48017550660d461e8cf6b.tar.gz | |
Merge branch 'fix-conflict-highlighting' into 'master'
Fix conflict highlighting
See merge request gitlab-org/gitlab-ce!15463
Diffstat (limited to 'db/schema.rb')
0 files changed, 0 insertions, 0 deletions