From 1285763015bb357297f573031cc3793d17fa702c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 22 Jun 2011 18:56:08 -0400
Subject: decruft

---
 .gitattributes | 2 --
 1 file changed, 2 deletions(-)

(limited to '.gitattributes')

diff --git a/.gitattributes b/.gitattributes
index b83edcae0..5d425843f 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,3 +1 @@
 debian/changelog merge=dpkg-mergechangelogs
-.git-annex/*.log merge=union
-.git-annex/*/*/*.log merge=union
-- 
cgit v1.2.3