X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=88660579736a54f220b86fbb6f78807a9c3a0e29;hb=a7866ac52b7341eeb920ee64ccdc77715ea85b32;hp=3cd0d8b02dbc7eb3279a901ee8089851f3d1d323;hpb=f48ffb354b9e9aca0df0307336fa51924b8e0d76;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 3cd0d8b..8866057 100644 --- a/lorem_ipsum.txt +++ b/lorem_ipsum.txt @@ -1,7 +1,7 @@ Tohle je dlouhy text, aby se daly simulovat nekonfliktni zmeny na ruznych mistech souboru. -Jina zmena. +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,