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=f541451c9850c4dc3f26a06491b2065c1305e247;hp=bd2968c57bfe6b7902230f92077e3d66c232684d;hpb=b40ba1f4e76dc6878e3194522732d4cb47493b67;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index bd2968c..bd4f4b5 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,6 +1,6 @@
-ds;kaf;slkdf;ask;falskf;dkas
+jezek
+tucnak
 
-YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.