X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;f=lorem_ipsum.txt;h=523e335d44d97870fccd03803b9a5768532f132c;hb=a6dcf0f3abbe0238c0af5238e2ff7280da4c88da;hp=fe09846784b951826a6eae24fed4926b6839de90;hpb=3cec6c550be4d039bcc746a42301ffca3b8d9ba6;p=test%2Ftestrepo.git

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index fe09846..523e335 100644
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,8 +1,10 @@
+Blabol
+
+Druhy blabol :-) :-O :-)
+
 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
@@ -109,4 +111,6 @@ A jeste dalsi zmena.
 
 9# Tady uz nic neni.
 9# Tady uz nic neni.
-
+10# a tady teprv ne.
+12#
+13#