Remove some leftovers from rebase.

ckeditor · Mar 25, 2019 · e665b28 · e665b28
1 parent a65eb61
commit e665b28
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/tests/_benderjs/ckeditor/static/tools.js b/tests/_benderjs/ckeditor/static/tools.js
@@ -1181,7 +1181,6 @@
 		},
 
 		/**
-<<<<<<< HEAD
 		 * Creates a promise from the given function. It works in a similar way as a promise constructor
 		 * (https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise),
 		 * with support for IE8 browser.