fixed unhandled merge

brijeshb42 · May 19, 2016 · 09cbcb4 · 09cbcb4
1 parent 3347592
commit 09cbcb4
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-style-confirm",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "homepage": "http://bitwiser.i/medium-style-confirm/",
   "authors": [
     "Brijesh Bittu <[email protected]>"

diff --git a/js/msc-script.js b/js/msc-script.js
@@ -160,7 +160,6 @@
             }
         }
     };
-    //window.msc = MscConfirm;
     var exportData = {
         mscConfirm: function(title, sub, onOk, onCancel) {
             buildUI(title, sub, onOk, onCancel, "confirm");
@@ -170,18 +169,13 @@
         },
         mscAlert: function(title, sub, onOk, onCancel) {
             buildUI(title, sub, onOk, onCancel, "alert");
+        },
+        mscClose: function() {
+            var prev = document.getElementsByClassName('msc-confirm');
+            if(prev.length > 0){
+                document.body.removeChild(prev[0]);
+            }
         }
     };
-<<<<<<< HEAD
     return exportData;
 }));
-=======
-    window.msc = {};
-    window.msc.close = function() {
-        var prev = document.getElementsByClassName('msc-confirm');
-        if(prev.length > 0){
-            document.body.removeChild(prev[0]);
-        }
-    };
-})();
->>>>>>> 7bc940df9d620bdf04b3f0130f6bdbaf63bb5a7e
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "medium-style-confirm",
-  "version": "0.4.4",
+  "version": "0.4.6",
   "description": "A medium.com like modal dialog UI library.",
   "main": "js/msc-script.js",
   "repository": {