Merge pull request #1 from ZitRos/master

Merge LICENSE file
intersystems-community · Apr 15, 2015 · 2da3632 · 2da3632
2 parents e87d1f1 + 207bc31
commit 2da3632
Showing 1 changed file with 4 additions and 0 deletions.
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