X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=lorem_ipsum.txt;h=5c685e48678afad3269b9c1dc8d78ce7e15065f0;hb=7f81c336f4ecbc4af5f1ed3ac975143b26272afb;hp=88660579736a54f220b86fbb6f78807a9c3a0e29;hpb=a7866ac52b7341eeb920ee64ccdc77715ea85b32;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 8866057..5c685e4 100644 --- a/lorem_ipsum.txt +++ b/lorem_ipsum.txt @@ -1,8 +1,6 @@ Tohle je dlouhy text, aby se daly simulovat nekonfliktni zmeny na ruznych mistech souboru. -A jeste dalsi zmena. - 1# Lorem ipsum dolor sit amet, consectetur adipisici elit, sed eiusmod 1# tempor incidunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 1# quis nostrud exercitation ullamco laboris nisi ut aliquid ex ea commodi @@ -107,4 +105,8 @@ A jeste dalsi zmena. 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#