fix typo

mnater · Jul 26, 2018 · 494b67e · 494b67e
1 parent 5e346c2
commit 494b67e
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/hyphenopoly.module.js b/hyphenopoly.module.js
@@ -2,7 +2,6 @@
  * @license Hyphenopoly.module.js 2.3.0 - hyphenation for node
  *  ©2018  Mathias Nater, Zürich (mathiasnater at gmail dot com)
  *  https://github.com/mnater/Hyphenopoly
->>>>>>> master
  *
  * Released under the MIT license
  * http://mnater.github.io/Hyphenopoly/LICENSE