Permalink
Browse files

resolving index conflict due to LABjs introduction

  • Loading branch information...
2 parents c3ca67d + e9bc6b2 commit e5ff8c15adb9539ce3358a323f2ecbbd5042c95a @addyosmani committed Apr 30, 2011
Showing with 14 additions and 0 deletions.
  1. +14 −0 index.html
View
@@ -3,6 +3,7 @@
<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
@@ -18,6 +19,19 @@
.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">

0 comments on commit e5ff8c1

Please sign in to comment.