From bc6819d6f3ff97b4f1b3bf584226d9e0fe39e9de Mon Sep 17 00:00:00 2001
From: Santhosh Thottingal <santhosh.thottingal@gmail.com>
Date: Sun, 16 Nov 2014 10:22:42 +0530
Subject: Update COPYING

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

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