Merge branch 'sdilena_vetev'

[test/testrepo.git] / lorem_ipsum.txt

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