From 92bf408c664e4fa66132a7095e1f856312ce667c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 12 Oct 2010 00:53:42 -0400
Subject: faddle

---
 Annex.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Annex.hs')

diff --git a/Annex.hs b/Annex.hs
index abb7bff6e..5a7274ca1 100644
--- a/Annex.hs
+++ b/Annex.hs
@@ -86,7 +86,7 @@ gitPrep :: GitRepo -> IO ()
 gitPrep repo = do
 	-- configure git to use union merge driver on state files
 	let attrLine = stateLoc ++ "/*.log merge=union"
-	attributes <- gitAttributes repo
+	let attributes = gitAttributes repo
 	exists <- doesFileExist attributes
 	if (not exists)
 		then do
-- 
cgit v1.2.3