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=61141da9d922ccea9a2c2a0b29af235cf6ba785e;hp=1bcc9e051f2ed4501cda8ac2ed362e2600da92ea;hpb=c93374bd4eb940e27d65c96c844a14bd6ee14950;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 1bcc9e0..bd4f4b5 100644 --- a/lorem_ipsum.txt +++ b/lorem_ipsum.txt @@ -1,3 +1,6 @@ +jezek +tucnak + Tohle je dlouhy text, aby se daly simulovat nekonfliktni zmeny na ruznych mistech souboru. @@ -105,4 +108,8 @@ zmeny na ruznych mistech souboru. 8# dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non 8# proident, sunt in culpa qui officia deserunt mollit anim id est laborum. - +9# Tady uz nic neni. +9# Tady uz nic neni. +10# a tady teprv ne. +12# +13#