From ee1888f53d8f5702b4d6a69a095838b721e7bd57 Mon Sep 17 00:00:00 2001
From: Nikita <ZitRos@users.noreply.github.com>
Date: Fri, 6 Nov 2015 15:32:33 +0200
Subject: [PATCH] license fix

---
 LICENSE | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 321afb2..60e45bb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,10 +1,6 @@
 The MIT License (MIT)
 
-<<<<<<< HEAD
 Copyright (c) 2015 InterSystems Corp.
-=======
-Copyright (c) 2015 Nikita
->>>>>>> upstream/master
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal