(no commit message)

diff --git a/student/becvalub/index.mdwn b/student/becvalub/index.mdwn
index 1d59653c2d3df2afdd04d460b0c396dd1a085a63..2b111a3073613795f6ec9699c6ebe071debb366d 100644 (file)
--- a/student/becvalub/index.mdwn
+++ b/student/becvalub/index.mdwn
@@ -20,7 +20,11 @@ Presentation
 
 * [[Presentation of the aim of my work in PDF |prezentace1.pdf]]
 
+<<<<<<< HEAD
 * [[Presentation of the results of my work in PDF|student/becvalub/prezentace2.pdf]]
+=======
+* [[Presentation of the results of my work in PDF|prezentace2.pdf]]
+>>>>>>> e5db14802f9581517658d8503709d9d4664dfde4
 
 Ohloh
 =====