(no commit message)

diff --git a/cviceni/12/rezervace.mdwn b/cviceni/12/rezervace.mdwn
index f38a66532a8dd3a6392df738dfb2ac7b3af21282..e9f6df233a48ba8afc7adc9b583d948b8afbae8e 100644 (file)
--- a/cviceni/12/rezervace.mdwn
+++ b/cviceni/12/rezervace.mdwn
@@ -27,8 +27,13 @@ Nedělejte v rozvrhu mezery a nepřepisujte cizí rezervace.
 * 10:15 [[dothang]]
 * 10:20 [[badalmar]]
 * 10:25
+<<<<<<< HEAD
 * 10:30
 * 10:35 [[makovma3]]
+=======
+* 10:30 [[mihalfi1]]
+* 10:35
+>>>>>>> bd9949f81fac6b62d49174b64edb04144f0b16aa
 * 10:40 [[janatjak]]
 
 ## Čtvrtek 11:00 – 12:30