X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=35be987c12fa8fcf58f4fe10c029f9c06af5c388;hb=1c6338f252a295e18c98dc8bea5cac2e91afce8f;hp=0fdda5a665000635c67e84d823dae4540f609629;hpb=933699ab5b27d1aceaec232eccb4a4472b40aa94;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 0fdda5a..35be987 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 @@ -111,3 +109,6 @@ A jeste dalsi zmena. 9# Tady uz nic neni. 10# a tady teprv ne. 12# +13# +14# +19#