From d0fd0a90be634e2f5b7b0892a9de8bfd898ed06d Mon Sep 17 00:00:00 2001
From: Fergal Moran <fergal.moran@gmail.com>
Date: Wed, 12 Sep 2012 12:41:07 +0100
Subject: [PATCH] Fixed conflicts

---
 templates/base.html | 26 +-------------------------
 1 file changed, 1 insertion(+), 25 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 8a12c95..47005f6 100755
--- a/templates/base.html
+++ b/templates/base.html
@@ -7,6 +7,7 @@
 
     <link href='http://fonts.googleapis.com/css?family=Open+Sans' rel='stylesheet' type='text/css'>
     {% load compress %}
+
     {% compress css %}
     <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap.min.css">
     <link rel="stylesheet" href="{{ STATIC_URL }}css/bootstrap/bootstrap-datepicker.css">
@@ -19,9 +20,7 @@
     <link rel="stylesheet" href="{{ STATIC_URL }}css/uploadifive.css">
     <link rel="stylesheet" href="{{ STATIC_URL }}css/com.podnoms.player.css">
     {% endcompress %}
-    <script src="/js/settings/"></script>
 
-<<<<<<< HEAD
     <script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
     <script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
     <script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
@@ -37,8 +36,6 @@
     <script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
     <script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
 
-=======
->>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
     <!-- horrible fix for horrible facebook -->
     <!-- horrible horrible facebook -->
     <script type="text/javascript">
@@ -93,24 +90,7 @@
 
     </div>
 </div>
-<<<<<<< HEAD
 <script src="/js/settings/"></script>
-=======
-<script src="{{ STATIC_URL }}js/libs/jquery.min.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jquery.form.js"></script>
-<script src="{{ STATIC_URL }}js/libs/ajaxfileupload.js"></script>
-<script src="{{ STATIC_URL }}js/libs/uploadify/jquery.uploadifive.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jquery.iphone-switch.js"></script>
-<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap.min.js"></script>
-<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap-datepicker.js"></script>
-<script src="{{ STATIC_URL }}js/libs/bootstrap/bootstrap-timepicker.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jasny/jasny-bootstrap.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jasny/bootstrap-fileupload.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jasny/bootstrap-rowlink.js"></script>
-<script src="{{ STATIC_URL }}js/libs/jquery.tablesorter.js"></script>
-<script src="{{ STATIC_URL }}js/libs/sm/soundmanager2.js"></script>
-<script src="{{ STATIC_URL }}js/libs/tiny_mce/jquery.tinymce.js"></script>
->>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
 
 <script src="{{ STATIC_URL }}js/libs/modernizr.js"></script>
 <script src="{{ STATIC_URL }}js/libs/backbone/underscore.js"></script>
@@ -119,17 +99,13 @@
 <script src="{{ STATIC_URL }}js/libs/backbone/backbone.mine.js"></script>
 <script src="{{ STATIC_URL }}js/libs/jquery.colorbox.js"></script>
 <!-- backbone application -->
-{% compress js %}
 <script src="{{ STATIC_URL }}js/libs/backbone/backbone-tastypie.js"></script>
 {%  compress js %}
 <script src="{{ STATIC_URL }}js/com.podnoms.utils.js"></script>
 <script src="{{ STATIC_URL }}js/com.podnoms.storage.js"></script>
-<<<<<<< HEAD
 <script src="{{ STATIC_URL }}js/com.podnoms.player.js"></script>
 <script src="{{ STATIC_URL }}js/app/site.js"></script>
 <script src="{{ STATIC_URL }}js/app/social.js"></script>
-=======
->>>>>>> 52d6d33f2e6312f24b4fdb91535f7ed1e2b93efe
 <script src="{{ STATIC_URL }}js/app/models/mix.js"></script>
 <script src="{{ STATIC_URL }}js/app/models/user.js"></script>
 <script src="{{ STATIC_URL }}js/app/models/comment.js"></script>