From 09cbcb4f7c997affaf5e0d213edd9f33420c5fa9 Mon Sep 17 00:00:00 2001
From: Brijesh Bittu <brijeshb42@gmail.com>
Date: Thu, 19 May 2016 17:05:09 +0530
Subject: [PATCH] fixed unhandled merge

---
 bower.json       |  2 +-
 js/msc-script.js | 18 ++++++------------
 package.json     |  2 +-
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/bower.json b/bower.json
index a5cc915..96e6bcb 100644
--- 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 <brijeshb42@gmail.com>"
diff --git a/js/msc-script.js b/js/msc-script.js
index 6ad7bd1..6044ca2 100644
--- 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
index e3dba1e..c1346e0 100644
--- 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": {