Merge branch 'sdilena_vetev'

[test/testrepo.git] / lorem_ipsum.txt

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