From 3e1e203b174405ff5e9809053f8ca50d8989dad7 Mon Sep 17 00:00:00 2001
From: Michael Zhou <zhoumotongxue008@gmail.com>
Date: Mon, 22 Feb 2016 15:47:26 -0500
Subject: [PATCH] [merge demo] Prepend link to diff-match-patch.js with
 "https:"

---
 demo/merge.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/demo/merge.html b/demo/merge.html
index c60e65329..20783b866 100644
--- a/demo/merge.html
+++ b/demo/merge.html
@@ -11,7 +11,7 @@
 <script src="../mode/css/css.js"></script>
 <script src="../mode/javascript/javascript.js"></script>
 <script src="../mode/htmlmixed/htmlmixed.js"></script>
-<script src="//cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/diff_match_patch/20121119/diff_match_patch.js"></script>
 <script src="../addon/merge/merge.js"></script>
 <style>
     .CodeMirror { line-height: 1.2; }
-- 
GitLab