resolving merge conflicts

intersystems-community · Jun 3, 2015 · 9eb0a8f · 9eb0a8f
2 parents cc614c0 + bc79de5
commit 9eb0a8f
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/README.md b/README.md
@@ -21,10 +21,7 @@ To install latest Caché UML Explorer, you just need to import UMLExplorer packa
 archive from [latest releases](https://github.com/ZitRos/CacheUMLExplorer/releases), and then import
 <code>Cache/CacheUMLExplorer-vX.X.X.xml</code> file.
 
-<<<<<<< HEAD
-=======
-###### Web applicationgulp
->>>>>>> upstream/master
+###### Web application
 Note that importing UMLExplorer.WebAppInstaller class will also create a /UMLExplorer application.
 If you want to create WEB application manually, please, do not import this class. Anyway, <b>
 importing this class requires %SYS permission.</b>