From f0f507bdc7a839e19871a8b00a758e34a5ac0318 Mon Sep 17 00:00:00 2001
From: Radu Woinaroski <radu.woinaroski@gmail.com>
Date: Sat, 4 Jun 2016 17:28:31 +0200
Subject: [PATCH] fixed merge conflict mistake

---
 mCustomScrollbar/mCustomScrollbar.d.ts | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mCustomScrollbar/mCustomScrollbar.d.ts b/mCustomScrollbar/mCustomScrollbar.d.ts
index 7db2b7574a..51c7c1852f 100644
--- a/mCustomScrollbar/mCustomScrollbar.d.ts
+++ b/mCustomScrollbar/mCustomScrollbar.d.ts
@@ -129,11 +129,6 @@ declare namespace MCustomScrollbar {
             */
             scrollType?: "stepless"|"stepped";
         }
-
-=======
-            disableOver?: string[]
-        }
->>>>>>> upstream/master
         /**
         * Mouse wheel scrolling pixels amount, value in pixels (integer) or "auto" (script calculates and sets pixels amount according to content length)
         */