From 6541921d0cb3cdc0d0333fc9dc1fbdf2586b47f6 Mon Sep 17 00:00:00 2001
From: Naim A <227396+naim94a@users.noreply.github.com>
Date: Fri, 7 Dec 2018 02:18:56 +0200
Subject: [PATCH] removed line from license

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

diff --git a/LICENSE b/LICENSE
index ea30c83..341176f 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 MIT License
 
 Copyright (c) 2018 Naim A.