Merge pull request #1 from ZitRos/master

zitros · zitros · commit 2da363216ebb · 2015-04-15T18:15:51.000+03:00
Merge LICENSE file
diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,10 @@
 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
