Merge pull request #13027 from DefinitelyTyped/12312-2

fix merge conflict for #12312
This commit is contained in:
Paul van Brenk
2016-11-30 15:23:20 -08:00
committed by GitHub
+1
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;
}