X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=6d393b9c3d72e48d895a11258835a3012de77a1a;hb=39e0bb03d7f656b2311537c765da738efa716e85;hp=1bcc9e051f2ed4501cda8ac2ed362e2600da92ea;hpb=c93374bd4eb940e27d65c96c844a14bd6ee14950;p=test%2Ftestrepo.git diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt index 1bcc9e0..6d393b9 100644 --- a/lorem_ipsum.txt +++ b/lorem_ipsum.txt @@ -1,6 +1,8 @@ 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