Differences between revisions 20 and 22 (spanning 2 versions)

Domovské stránky členov katedry

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 20 as of 2015-03-04 15:30:23 → 
  Size: 1501
  Editor: jenca
  Comment:
+   ← Revision 22 as of 2015-03-04 15:32:47 → ⇥
  Size: 1782
  Editor: jenca
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 27:
- * [[zdimalova | Mgr. Mária Ždímalová PhD.]]
+---- /!\ '''Edit conflict - other version:''' ----
 * [[zdimalova | Gejza Jenča ]]
-Line 29:
+Line 33:
+---- /!\ '''Edit conflict - your version:''' ----
 * [[http://www.math.sk/wiki/zdimalova | Mgr. Mária Ždímalová PhD.]]
## * [[http://www.math.sk/luba | RNDr. Ľubica Valášková PhD.]]

---- /!\ '''End of edit conflict''' ----