Diff for "HoutanBastani"

Differences between revisions 36 and 40 (spanning 4 versions)

Houtan Bastani

Email:	`<houtan AT SPAMFREE dynare DOT org>`
Office:	+33 (0)1 40 77 84 14
Mobile:	+33 (0)6 51 01 40 01

-  ⇤ ← Revision 36 as of 2013-03-22 16:27:18 → 
  Size: 690
  Editor: HoutanBastani
  Comment:
+   ← Revision 40 as of 2013-11-05 10:01:19 → ⇥
  Size: 250
  Editor: HoutanBastani
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 11:
-|| Day || Hours ||

---- /!\ '''Edit conflict - other version:''' ----
|| M || 9h30 - 12h30 ||
|| T || 9h30 - 12h30, 16h30 - 19h30 ||
|| W || 9h30 - 12h30 ||
|| R || 9h30 - 12h30 ||
|| F || ||

---- /!\ '''Edit conflict - your version:''' ----
|| M || 9h30 - 12h30, 13h30 - 16h30 ||
|| T || 9h30 - 12h30, 16h30 - 19h30 ||
|| W || 9h30 - 12h30 ||
|| R || 9h30 - 12h30 ||
|| F || ||

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