Skip to content

G
gitlab-ce
Commit 533c65f8 authored by Dennis Tang's avatar Dennis Tang
Browse files
Options

Resolve CE-EE conflict in app/assets/javascripts/pages/projects/project.js

parent d3a28ea7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 3 deletions
app/assets/javascripts/pages/projects/project.js
View file @ 533c65f8
...@@ -39,14 +39,11 @@ export default class Project { ...@@ -39,14 +39,11 @@ export default class Project {
$label.text(activeText); $label.text(activeText);
}); });
<<<<<<< HEAD
$('#modal-geo-info').data({ $('#modal-geo-info').data({
cloneUrlSecondary: $this.attr('href'), cloneUrlSecondary: $this.attr('href'),
cloneUrlPrimary: $this.data('primaryUrl') || '', cloneUrlPrimary: $this.data('primaryUrl') || '',
}); });
=======
>>>>>>> upstream/master
if (mobileCloneField) { if (mobileCloneField) {
mobileCloneField.dataset.clipboardText = url; mobileCloneField.dataset.clipboardText = url;
} else { } else {
......
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