summaryrefslogtreecommitdiff
path: root/app/assets/javascripts/merge_conflicts
diff options
context:
space:
mode:
authorMike Greiling <mike@pixelcog.com>2017-05-16 15:51:28 -0500
committerMike Greiling <mike@pixelcog.com>2017-05-16 15:51:28 -0500
commitf5ad1dcbf88dc69254fe86be2fd6b20fead308c0 (patch)
tree920e62776ed2417fb5a95a43a623d1565437f331 /app/assets/javascripts/merge_conflicts
parent0fce2df7b04ab3ec3d529bbc6aff1846a45aa9dc (diff)
downloadgitlab-ce-f5ad1dcbf88dc69254fe86be2fd6b20fead308c0.tar.gz
update shortcuts scripts to use ES module syntax
Diffstat (limited to 'app/assets/javascripts/merge_conflicts')
0 files changed, 0 insertions, 0 deletions