X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=bd4f4b566850fe8639d583aa241aaadc50fa6ac6;hb=df399c865d729ec8c89a681c5c38ea6ae4fe5938;hp=3cd0d8b02dbc7eb3279a901ee8089851f3d1d323;hpb=f48ffb354b9e9aca0df0307336fa51924b8e0d76;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index 3cd0d8b..bd4f4b5 100644
--- 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.
 
-Jina 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
@@ -107,4 +108,8 @@ Jina zmena.
 8# dolore eu fugiat nulla pariatur. Excepteur sint obcaecat cupiditat non
 8# proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
 
-
+9# Tady uz nic neni.
+9# Tady uz nic neni.
+10# a tady teprv ne.
+12#
+13#