un-merge conflict by wbx@ · b8342db24c - wbx's git sevice

un-merge conflict by wbx@

Signed-off-by: Thorsten Glaser <tg@mirbsd.org>

Thorsten Glaser 15 years ago

parent

ff88b47383

commit

b8342db24c

1 changed files with 1 additions and 1 deletions

Split View Show Diff Stats

						
							+ 1
							
							- 1
						
package/pkgmaker
							 
								View File
							
				@@ -112,6 +112,6 @@ EOF
			
				 		print \\thelp
			
				 		print "\t  flavour ADK_PACKAGE_${dnu}_$pf"
			
				 	done
			
				-	) >Config.in
			
				+	) >Config.new
			
				 	cd ..
			
				 done