From 494b67e55a4fefb5dc94ca89c09e8f8f88005f85 Mon Sep 17 00:00:00 2001
From: mnater <mathiasnater@gmail.com>
Date: Thu, 26 Jul 2018 12:58:47 +0200
Subject: [PATCH] fix typo

---
 hyphenopoly.module.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hyphenopoly.module.js b/hyphenopoly.module.js
index 0e55b280..e18899fc 100644
--- 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