Fix conflicts with current develop branch

RocketChat · Feb 23, 2017 · ab783a8 · ab783a8
1 parent 7bf9921
commit ab783a8
Showing 1 changed file with 0 additions and 27 deletions.
diff --git a/src/scripts/sidebar.js b/src/scripts/sidebar.js
@@ -202,36 +202,9 @@ class SideBar extends EventEmitter {
         document.body.classList.remove('hide-server-list');
         localStorage.setItem('sidebar-closed', 'false');
         this.emit('show');
-<<<<<<< HEAD
         if (process.platform == 'darwin') {
-=======
-        this.addPlatformStyleForShow();
-    }
-
-    toggle () {
-        if (this.isHidden()) {
-            this.show();
-        } else {
-            this.hide();
-        }
-    }
-
-    addPlatformStyleForShow () {
-        if (process.platform === 'darwin') {
-            [].forEach.call(document.getElementsByTagName('webview'),
-                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out; }'); } });
-        }
-    }
-
-    addPlatformStyleForHide () {
-        if (process.platform === 'darwin') {
->>>>>>> [macOS] Fix issues found by codacy bot
             [].forEach.call(document.getElementsByTagName('webview'),
-<<<<<<< HEAD
                 (webviewObj) => { if(webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:0; overflow:hidden; transition: margin .5s ease-in-out; }'); } });
-=======
-                (webviewObj) => { if (webviewObj.insertCSS) { webviewObj.insertCSS('aside.side-nav{margin-top:15px;overflow:hidden; transition: margin .5s ease-in-out; }'); } });
->>>>>>> [macOS] Fix issues found by codacy bot
         }
     }