From 5a11c57686a13bbfe63b4e6002ed05bd86fa6926 Mon Sep 17 00:00:00 2001
From: ZitRos <zitros.lab@gmail.com>
Date: Mon, 14 Sep 2015 00:13:09 +0300
Subject: [PATCH] cleanup

---
 package.json | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/package.json b/package.json
index e8abe04..3a1d30f 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "CacheUMLExplorer",
-<<<<<<< HEAD
   "version": "1.0.0",
-=======
-  "version": "0.15.1",
->>>>>>> 59d55bd711e05c45ac628bff99372683be3b7378
   "description": "An UML Class explorer for InterSystems Caché",
   "directories": {
     "test": "test"