Zkousim konflikt.

[test/testrepo.git] / lorem_ipsum.txt

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index d8e0ef0bed314cdc9728565c6081987b80e27f2f..f8943aa1c46d462caa373c33fc195cdd059b9855 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,8 +1,7 @@
+YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
-A jeste dalsi zmena.
-
 1# Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod
 1# tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam,
 1# quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi