From c2fc711f869047a3ebd97f3381ab5518d63df8e2 Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Sun, 16 Nov 2014 12:39:44 +0530
Subject: Update COPYING

---
 COPYING | 1 -
 1 file changed, 1 deletion(-)

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.
-- 
cgit