1 files changed, 0 insertions, 1 deletions
diff --git a/COPYING b/COPYING
index da8db04..7e16ea6 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 Copyright (c) 2004, Kevin & Siji,
 with Reserved Font Name AnjaliOldLipi.
 Copyright (c) 2008, Hiran Venugopalan.