From 6607806c4056db700631cc218d1ebc5875fb0eca Mon Sep 17 00:00:00 2001
From: Anon Ray <rayanon004@gmail.com>
Date: Mon, 24 Feb 2014 13:33:13 +0530
Subject: [PATCH] Merge branch 'master' of git.pantoto.org:mouchak/mouchak

---
 mouchak/templates/base.html  |    1 -
 mouchak/templates/index.html |    1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/mouchak/templates/base.html b/mouchak/templates/base.html
index df33d3c..6cb7b59 100644
--- a/mouchak/templates/base.html
+++ b/mouchak/templates/base.html
@@ -16,7 +16,6 @@
     <link rel="stylesheet" href="{{url_for('static', filename='css/normalize.css')}}">
     <link rel="stylesheet" href="{{url_for('static', filename='css/bootstrap.min.css')}}" media="screen">
     <link rel="stylesheet" href="{{url_for('static', filename='css/mouchak.css')}}">
-    <link rel="stylesheet" href="{{url_for('static', filename='css/main.css')}}">
     <script src="{{url_for('static', filename='js/lib/modernizr-2.6.2.min.js')}}"></script>
 
     <!--TODO: make this optional, only when there is a map plugin in the site. There
diff --git a/mouchak/templates/index.html b/mouchak/templates/index.html
index 72bb330..6874cf7 100644
--- a/mouchak/templates/index.html
+++ b/mouchak/templates/index.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 
 {% block head %}
+  <link rel="stylesheet" href="{{url_for('static', filename='css/main.css')}}">
   <title> {{ title }} </title>
 {% endblock %}
 
-- 
1.7.10.4