Diff for "HoutanBastani"

Differences between revisions 1 and 36 (spanning 35 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

Day

Hours

$/!\$ Edit conflict - other version:

$/!\$ Edit conflict - your version:

$/!\$ End of edit conflict

-  ⇤ ← Revision 1 as of 2010-02-05 08:56:14 → 
  Size: 189
  Editor: HoutanBastani
  Comment:
+   ← Revision 36 as of 2013-03-22 16:27:18 → ⇥
  Size: 690
  Editor: HoutanBastani
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 4:
-== Your Name ==
+== Houtan Bastani ==
 Line 6:
-Email: <<MailTo(houtanb AT SPAMFREE gmail DOT com)>>
Telephone: 063-855-6728
...
+||Email: || <<MailTo(houtan AT SPAMFREE dynare DOT org)>> ||
||Office:|| +33 (0)1 40 77 84 14 ||
||Mobile:|| +33 (0)6 51 01 40 01 ||

|| 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''' ----