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=a7ffc2a3944c9b7248ccfd657dc2aa24b34a00d8;p=test.git

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

Conflicts:
	test.txt
---

diff --git a/test.txt b/test.txt
index 5d33810..b430af4 100644
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,3 @@
 test
 abc
 12345
-