X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=bd4f4b566850fe8639d583aa241aaadc50fa6ac6;hb=4acb972684281506daa507116827891bb7bcd075;hp=523e335d44d97870fccd03803b9a5768532f132c;hpb=a6dcf0f3abbe0238c0af5238e2ff7280da4c88da;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 523e335..bd4f4b5 100644
--- 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.