summaryrefslogtreecommitdiff
path: root/app/assets/stylesheets
diff options
context:
space:
mode:
authorAlfredo Sumaran <alfredo@gitlab.com>2016-10-17 12:43:17 -0500
committerAlfredo Sumaran <alfredo@gitlab.com>2016-10-17 12:43:17 -0500
commit28dbfd5c4c7793be4147ba217e7d9e162905088b (patch)
treea3aee9ca751feb5f556c1e290f3f517b1f4c935d /app/assets/stylesheets
parenta975e4cb34349fb04305d6fb50756adf289ff633 (diff)
downloadgitlab-ce-28dbfd5c4c7793be4147ba217e7d9e162905088b.tar.gz
Provide better error message to the usermerge-conflicts-editor-2
Diffstat (limited to 'app/assets/stylesheets')
0 files changed, 0 insertions, 0 deletions