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

Conflicts:
	test.txt

diff --git a/test.txt b/test.txt
index 5d338103d590da478f49b2aacd310b9d1702a012..b430af451e66fa5d5fe918494b1f581a496740df 100644 (file)
--- a/test.txt
+++ b/test.txt
@@ -1,4 +1,3 @@
 test
 abc
 12345
-