Resolve conflict in app/assets/javascripts/project.js

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/javascripts/project.js

@@ -25,14 +25,11 @@ export default class Project {
       $this.toggleClass('is-active');
       $projectCloneField.val(url);
       $cloneBtnText.text(activeText);
-<<<<<<< HEAD
 
       $('#modal-geo-info').data({
         cloneUrlSecondary: $this.attr('href'),
         cloneUrlPrimary: $this.data('primaryUrl') || '',
       });
-=======
->>>>>>> upstream/master
 
       return $('.clone').text(url);
     });