diff options
| author | james <james.bryant@elizabetharden.com> | 2012-12-30 14:03:08 -0500 |
|---|---|---|
| committer | james <james.bryant@elizabetharden.com> | 2012-12-30 14:03:08 -0500 |
| commit | 264f26a15852644f0b787d61c3f58da7e75e9aa6 (patch) | |
| tree | fbd3532c74cbb5557c30a2496416e70a85760b84 /syte | |
| parent | 3aae16db8c96c077659763ad9ae41f1cb2f808c2 (diff) | |
| parent | 0515b40255724fe55835295743293d97627bf2c0 (diff) | |
| download | pelican-themes-264f26a15852644f0b787d61c3f58da7e75e9aa6.tar.gz | |
Merge branch 'master' of https://github.com/jamesbeebop/pelican-themes
Conflicts:
syte/templates/base.html
Fixing up divergence between local and master origin
Diffstat (limited to 'syte')
| -rw-r--r-- | syte/templates/base.html | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/syte/templates/base.html b/syte/templates/base.html index e224cb6..764f9c5 100644 --- 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 }}" /> |