Skip to content

G
gitlab-ce
Commit dc41b06e authored by Stan Hu's avatar Stan Hu
Browse files
Options

Resolve conflict in app/assets/javascripts/pages/projects/issues/show.js

parent 9130cfb7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
app/assets/javascripts/pages/projects/issues/show.js
View file @ dc41b06e
...@@ -11,7 +11,3 @@ export default function () { ...@@ -11,7 +11,3 @@ export default function () {
new ZenMode(); // eslint-disable-line no-new new ZenMode(); // eslint-disable-line no-new
initIssuableSidebar(); initIssuableSidebar();
} }
<<<<<<< HEAD
=======
>>>>>>> upstream/master
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7