From 1c57debdd9d96b35ec59be198b7eaf777a661550 Mon Sep 17 00:00:00 2001
From: james <james.bryant@elizabetharden.com>
Date: Wed, 9 Jan 2013 13:08:14 -0500
Subject: Resolving conflict in syte/templates/base.html

---
 syte/templates/base.html | 4 ----
 1 file changed, 4 deletions(-)

(limited to 'syte/templates/base.html')

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 }}" />
-- 
cgit