From b8342db24c4b4f1c45211352e120e21d2756b1dc Mon Sep 17 00:00:00 2001
From: Thorsten Glaser <tg@mirbsd.org>
Date: Sun, 20 Dec 2009 17:34:09 +0059
Subject: un-merge conflict by wbx@

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>
---
 package/pkgmaker | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'package/pkgmaker')

diff --git a/package/pkgmaker b/package/pkgmaker
index 9d5b40761..28167a0a4 100644
--- a/package/pkgmaker
+++ b/package/pkgmaker
@@ -112,6 +112,6 @@ EOF
 		print \\thelp
 		print "\t  flavour ADK_PACKAGE_${dnu}_$pf"
 	done
-	) >Config.in
+	) >Config.new
 	cd ..
 done
-- 
cgit v1.2.3