fixed merge conflict mistake

2026-04-01 12:42:58 +08:00 · 2016-06-04 17:28:31 +02:00
parent c316b014dc
commit f0f507bdc7
1 changed files with 0 additions and 5 deletions
--- 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)
        */