summaryrefslogtreecommitdiff
path: root/snap.html
diff options
context:
space:
mode:
authorGubolin <gubolin@fantasymail.de>2014-09-12 19:54:58 +0200
committerGubolin <gubolin@fantasymail.de>2014-09-12 19:54:58 +0200
commit0772e7d750532a91fc89c9bb131229a7fb989b91 (patch)
tree0169c343a399cb2d3d7faa84518d798fe4b50f16 /snap.html
parent39a50e190ac39560564507399d26fe7c141de86f (diff)
downloadsnap-0772e7d750532a91fc89c9bb131229a7fb989b91.tar.gz
snap-0772e7d750532a91fc89c9bb131229a7fb989b91.zip
support merging [WIP]
Diffstat (limited to 'snap.html')
-rwxr-xr-xsnap.html1
1 files changed, 1 insertions, 0 deletions
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 () {