1 files changed, 0 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index 35e2008..da8db04 100644
--- a/COPYING
+++ b/COPYING
@@ -198,4 +198,3 @@ DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
 FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
 OTHER DEALINGS IN THE FONT SOFTWARE.
 
->>>>>>> 212445937a4f9f9334c36f654f2d62490319922e