https://www.fi.muni.cz/~kas/git / test / testrepo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: b40ba1f)
Test
authorDaniel Jakubik <xjakubik@akis.fi.muni.cz>
Wed, 6 Apr 2011 14:20:55 +0000 (16:20 +0200)
committerDaniel Jakubik <xjakubik@akis.fi.muni.cz>
Wed, 6 Apr 2011 14:20:55 +0000 (16:20 +0200)
lorem_ipsum.txt patch | blob | history

diff --git a/lorem_ipsum.txt b/lorem_ipsum.txt
index bd2968c57bfe6b7902230f92077e3d66c232684d..5c685e48678afad3269b9c1dc8d78ce7e15065f0 100644 (file)
--- a/lorem_ipsum.txt
+++ b/lorem_ipsum.txt
@@ -1,6 +1,3 @@
-ds;kaf;slkdf;ask;falskf;dkas
-
-YYY
 Tohle je dlouhy text, aby se daly simulovat nekonfliktni
 zmeny na ruznych mistech souboru.
 
Testovaci repozitar