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) */