From 82f75282d96bd7964ec7ad2222692f1b21cccfbd Mon Sep 17 00:00:00 2001
From: Paul van Brenk <paul.van.brenk@microsoft.com>
Date: Wed, 30 Nov 2016 15:14:47 -0800
Subject: [PATCH] fix merge conflict for #12312

---
 markitup/index.d.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/markitup/index.d.ts b/markitup/index.d.ts
index b24347454a..d7884021a8 100644
--- a/markitup/index.d.ts
+++ b/markitup/index.d.ts
@@ -233,5 +233,6 @@ interface JQueryStatic {
 
 interface JQuery {
     markItUp(settings?: MarkItUp.Options): JQuery;
+    markItUp(settings?: MarkItUp.Options, extraSettings?: MarkItUp.Options): JQuery;
     markItUpRemove(): JQuery;
 }