Merge branch 'master' of https://github.com/jamesbeebop/pelican-themes

Conflicts: syte/templates/base.html Fixing up divergence between local and master origin
2012-12-30 14:03:08 -05:00
parent 3aae16db8c 0515b40255
commit 264f26a158
1 changed files with 4 additions and 0 deletions
--- a/syte/templates/base.html
+++ b/syte/templates/base.html
@@ -9,7 +9,11 @@
  <!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->

 {% assets filters="cssmin", output="css/styles.min.css", "css/styles.css", "css/pygments.css" %}
+<<<<<<< HEAD
 <link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
+=======
+    <link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
+>>>>>>> 0515b40255724fe55835295743293d97627bf2c0
 {% endassets %}

  <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />