summaryrefslogtreecommitdiff
path: root/snap.html
diff options
context:
space:
mode:
authorGubolin <gubolin@fantasymail.de>2015-01-02 10:30:00 +0100
committerGubolin <gubolin@fantasymail.de>2015-01-02 10:30:00 +0100
commitaba651ba26bc9e79016b34070da5eacd407dac99 (patch)
tree8c92107550bbce2c715e32e90f4cd9a14fde7015 /snap.html
parent98755a4467991b6fb31563b17f8c15b1c5266294 (diff)
parentb31df39d7f126eaa303c8dae1cf6a14c739a2cc5 (diff)
downloadsnap-anykey_issue387.tar.gz
snap-anykey_issue387.zip
resolve merge conflictanykey_issue387
Diffstat (limited to 'snap.html')
-rwxr-xr-xsnap.html4
1 files changed, 2 insertions, 2 deletions
diff --git a/snap.html b/snap.html
index 904aba8..93b4c73 100755
--- a/snap.html
+++ b/snap.html
@@ -3,7 +3,7 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<title>Snap! Build Your Own Blocks. Beta</title>
- <link rel="shortcut icon" href="http://snap.berkeley.edu/fav3.gif" type="image/gif">
+ <link rel="shortcut icon" href="favicon.ico">
<script type="text/javascript" src="morphic.js"></script>
<script type="text/javascript" src="widgets.js"></script>
<script type="text/javascript" src="blocks.js"></script>
@@ -33,5 +33,5 @@
</head>
<body style="margin: 0;">
<canvas id="world" tabindex="1" style="position: absolute;" />
- </body>
+ </body>
</html>