fix merge conflict for #12312

This commit is contained in:
Paul van Brenk 2016-11-30 15:14:47 -08:00
parent fb23920cfe
commit 82f75282d9

1
markitup/index.d.ts vendored
View File

@ -233,5 +233,6 @@ interface JQueryStatic {
interface JQuery {
markItUp(settings?: MarkItUp.Options): JQuery;
markItUp(settings?: MarkItUp.Options, extraSettings?: MarkItUp.Options): JQuery;
markItUpRemove(): JQuery;
}