Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

ensuring all tutorial tweaks applied

  • Loading branch information...
commit 06607f74aa22268cd5646af75e9a5dce1f7ed0e1 1 parent e5ff8c1
@addyosmani authored
Showing with 0 additions and 14 deletions.
  1. +0 −14 index.html
View
14 index.html
@@ -3,7 +3,6 @@
<head>
<link rel="stylesheet" href="css/application.css" type="text/css" charset="utf-8">
-<<<<<<< HEAD
<script src="lib/LAB.min.js" type="text/javascript" charset="utf-8"></script>
<script type="text/javascript">
$LAB
@@ -19,19 +18,6 @@
.script("app/models/url.js")
.script("app/application.js");
</script>
-=======
- <script src="lib/json.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/jquery.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/jquery.tmpl.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/jquery.bitly.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/store.min.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/spine.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/spine.model.local.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/spine.controller.manager.js" type="text/javascript" charset="utf-8"></script>
- <script src="lib/spine.route.js" type="text/javascript" charset="utf-8"></script>
- <script src="app/models/url.js" type="text/javascript" charset="utf-8"></script>
- <script src="app/application.js" type="text/javascript" charset="utf-8"></script>
->>>>>>> e9bc6b2550145347cb323422915ff15c741d15b7
<script type="text/x-jquery-tmpl" id="urlTemplate">
<div class="item">
Please sign in to comment.
Something went wrong with that request. Please try again.