Merge branch 'sdilena_vetev'

[test/testrepo.git] / lorem_ipsum.txt

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index e229baccebf2396b4f6c413dbb1900761497efe5..bd4f4b566850fe8639d583aa241aaadc50fa6ac6 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,8 +1,9 @@
+jezek
+tucnak
+
 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 +111,5 @@ A jeste dalsi zmena.
 9# Tady uz nic neni.
 9# Tady uz nic neni.
 10# a tady teprv ne.
+12#
+13#