From 0772e7d750532a91fc89c9bb131229a7fb989b91 Mon Sep 17 00:00:00 2001
From: Gubolin <gubolin@fantasymail.de>
Date: Fri, 12 Sep 2014 19:54:58 +0200
Subject: support merging [WIP]

---
 snap.html | 1 +
 1 file changed, 1 insertion(+)

(limited to 'snap.html')

diff --git a/snap.html b/snap.html
index 733b571..63bdebd 100755
--- a/snap.html
+++ b/snap.html
@@ -22,6 +22,7 @@
                 <script type="text/javascript" src="github.js"></script>
 		<script type="text/javascript" src="sha512.js"></script>
                 <script type="text/javascript" src="vkBeautify/vkbeautify.js"></script>
+                <script type="text/javascript" src="diff-merge/dist/diff.js"></script>
 		<script type="text/javascript">
 			var world;
 			window.onload = function () {
-- 
cgit v1.3.1