X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=5c685e48678afad3269b9c1dc8d78ce7e15065f0;hb=7f81c336f4ecbc4af5f1ed3ac975143b26272afb;hp=e229baccebf2396b4f6c413dbb1900761497efe5;hpb=5264ac352ada196a7b479e2adfe544257b1c6a7c;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index e229bac..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
@@ -110,3 +108,5 @@ A jeste dalsi zmena.
 9# Tady uz nic neni.
 9# Tady uz nic neni.
 10# a tady teprv ne.
+12#
+13#