Commit abccc8c7 authored by Rémy Coutable's avatar Rémy Coutable

Resolve a forgotten conflict

Signed-off-by: default avatarRémy Coutable <remy@rymai.me>
parent ad2f0fe9
......@@ -89,8 +89,6 @@ require('~/lib/utils/url_utility');
).toBe('<script>alert("testing");</script>');
});
<<<<<<< HEAD
=======
it('should output HTML when highlighting', () => {
this.projectsData[0].name_with_namespace = 'testing';
$('.dropdown-input .dropdown-input-field').val('test');
......@@ -110,7 +108,6 @@ require('~/lib/utils/url_utility');
).toBe('<b>t</b><b>e</b><b>s</b><b>t</b>ing');
});
>>>>>>> upstream/master
describe('that is open', () => {
beforeEach(() => {
initDropDown.call(this, false, false);
......
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