From 90a5c45e13e1e910c019e3bb3e8ee76b0bd8ee6c Mon Sep 17 00:00:00 2001
From: Mark Holtzhausen <mark@knowledgetree.com>
Date: Wed, 1 Jul 2009 17:51:52 +0200
Subject: [PATCH] Repo Fix

---
 .htaccess | 3 ---
 1 file changed, 0 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index 590ee5b..c5fbb1d 100644
--- a/.htaccess
+++ b/.htaccess
@@ -61,10 +61,7 @@ Options +SymLinksIfOwnerMatch
 #AcceptPathInfo On
 
 AddOutputFilter DEFLATE text/html text/plain text/xml text/javascript application/x-javascript text/css
-<<<<<<< HEAD:.htaccess
-=======
 # The following seems to breaking things on ZendServer - kgf
->>>>>>> 3021d9ce95b467f66a2f65312d7db0e1f55c0d8c:.htaccess
 #ExpiresActive ON
 #ExpiresByType text/html "access plus 1 day"
 #ExpiresByType text/css "access plus 1 day"
--
libgit2 0.21.4