diff options
| author | james <james.bryant@elizabetharden.com> | 2013-01-09 13:08:14 -0500 |
|---|---|---|
| committer | james <james.bryant@elizabetharden.com> | 2013-01-09 13:08:14 -0500 |
| commit | 1c57debdd9d96b35ec59be198b7eaf777a661550 (patch) | |
| tree | 9cddb994a0ee4d2d33796d939ee370ee01b7b43b /syte | |
| parent | 4b5ed29cd1e3e15027adbc76d5705ea8e58aab38 (diff) | |
| download | pelican-themes-1c57debdd9d96b35ec59be198b7eaf777a661550.zip pelican-themes-1c57debdd9d96b35ec59be198b7eaf777a661550.tar.gz pelican-themes-1c57debdd9d96b35ec59be198b7eaf777a661550.tar.bz2 | |
Resolving conflict in syte/templates/base.html
Diffstat (limited to 'syte')
| -rw-r--r-- | syte/templates/base.html | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/syte/templates/base.html b/syte/templates/base.html index c9e4807..7a70cab 100644 --- a/syte/templates/base.html +++ b/syte/templates/base.html @@ -9,11 +9,7 @@ <!--[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 }}" /> |