summaryrefslogtreecommitdiff
path: root/app/models/project.rb
diff options
context:
space:
mode:
authorPhil Hughes <me@iamphill.com>2017-11-29 10:26:35 +0000
committerPhil Hughes <me@iamphill.com>2017-11-29 10:26:35 +0000
commit1880809d8ef9b650d1af615ebbaa590626ccf17f (patch)
treeeef870533780f46d46a638446ceaa7e878122627 /app/models/project.rb
parentd22bb0397b04f2870c6fbbeb2912ef6627e4afb7 (diff)
downloadgitlab-ce-1880809d8ef9b650d1af615ebbaa590626ccf17f.tar.gz
added editor options to redcue EE conflicts
Diffstat (limited to 'app/models/project.rb')
0 files changed, 0 insertions, 0 deletions