Merge branch 'master' of https://github.com/intersystems-ru/UMLExplorer

nikitaeverywhere · nikitaeverywhere · commit 0f4057d34db2 · 2015-11-08T17:33:38.000+02:00
diff --git 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
