X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=06f0aeb907d6da6dcefe1ca5a42571449c10b311;hb=de54fe0c47b2e7e73c99007c90950d794cd510b1;hp=6d393b9c3d72e48d895a11258835a3012de77a1a;hpb=39e0bb03d7f656b2311537c765da738efa716e85;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 6d393b9..06f0aeb 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. -Nejaka 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,9 @@ Nejaka 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# +14#