summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSanthosh Thottingal <santhosh.thottingal@gmail.com>2014-11-16 12:39:44 +0530
committerSanthosh Thottingal <santhosh.thottingal@gmail.com>2014-11-16 12:39:44 +0530
commitc2fc711f869047a3ebd97f3381ab5518d63df8e2 (patch)
tree84825c0e951f2a3ed10ff624e61ac732e8dacc9d
parentbc6819d6f3ff97b4f1b3bf584226d9e0fe39e9de (diff)
downloadAnjaliOldLipi.git-c2fc711f869047a3ebd97f3381ab5518d63df8e2.zip
AnjaliOldLipi.git-c2fc711f869047a3ebd97f3381ab5518d63df8e2.tar.gz
AnjaliOldLipi.git-c2fc711f869047a3ebd97f3381ab5518d63df8e2.tar.xz
Update COPYING
-rw-r--r--COPYING1
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.