X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=967af95abe84541295a31b394a2d1e46456ea29d;hb=897cdd174ed844f3afc46794fc991b7e3de969a7;hp=f2ff2056a38ee50610319bcfb7f023f2db095256;hpb=07b034dedcae85a6abe95f4fab1501ac7c653ef4;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index f2ff205..967af95 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,7 +1,6 @@
 Blabol
 jezek
-
-Druhy blabol :-) :-O :-)
+tucnak
 
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.