From: Marcin Krol <hawk@tld-linux.org>
Date: Mon, 12 Sep 2011 19:50:56 +0000 (+0200)
Subject: - Merge branch 'TEST' of git.tld-linux.org:test
X-Git-Tag: BLAH_0_1~1
X-Git-Url: https://git.tld-linux.org/?a=commitdiff_plain;h=eb4bef3de5bd2c698942e0f2a6c0775d373e6c96;hp=b8d94b336a0934b919bd49a6bab0c9af2bc31363;p=test.git

- Merge branch 'TEST' of git.tld-linux.org:test

Conflicts:
	test.txt
---

diff --git a/geninitrd.spec b/geninitrd.spec
index 1d9842d..ed5c123 100644
--- a/geninitrd.spec
+++ b/geninitrd.spec
@@ -1,5 +1,4 @@
 # $Revision: 2.181 $, $Date: 2011/04/10 12:40:58 $
-#
 ### TODO:
 # - BUG: you can't set in /etc/mdadm.conf:
 #  DEVICE partitions containers