sambuc/pelican-themes
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	syte/templates/base.html

Fixing up divergence between local and master origin
This commit is contained in:
james
2012-12-30 14:03:08 -05:00
parent 3aae16db8c 0515b40255
commit 264f26a158
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
syte/templates/base.html
View File

@@ -9,7 +9,11 @@
<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]--> <!--[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" %} {% 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 }}">
=======
<link rel="stylesheet" href="{{ SITE_URL }}/{{ ASSET_URL }}">
>>>>>>> 0515b40255724fe55835295743293d97627bf2c0
{% endassets %} {% endassets %}
<link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" /> <link rel="shortcut icon" type="image/png" href="{{ GRAVATAR }}" />