Resolving conflict in syte/templates/base.html

2013-01-09 13:08:14 -05:00
parent 4b5ed29cd1
commit 1c57debdd9
1 changed files with 0 additions and 4 deletions
--- 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 }}" />