diff options
| -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 }}" /> |