Merge branch 'sdilena_vetev'

[test/testrepo.git] / lorem_ipsum.txt

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index f8943aa1c46d462caa373c33fc195cdd059b9855..bd4f4b566850fe8639d583aa241aaadc50fa6ac6 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,4 +1,6 @@
-YYY
+jezek
+tucnak
+
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.