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

intersystems-community · Nov 8, 2015 · 0f4057d · 0f4057d
2 parents 4b2aca3 + ee1888f
commit 0f4057d
Showing 1 changed file with 0 additions and 4 deletions.
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