Diff for "AstronomerOnDutyScheduleOld"

Differences between revisions 36 and 37

Week	Dates	AoD	Comments



---- /!\ '''Edit conflict - other version:''' ----
22	30.5.-6.6.2006	Leon

---- /!\ '''Edit conflict - your version:''' ----
22	30.5.-6.6.2006	Leon

---- /!\ '''End of edit conflict''' ----
23	6.6.-13.6.	Marcelino
24	13.6.-20.6.	Sievers(Tue-Fri) Ungerechts (Fri-Tue)
25	20.6.-27.6.	Ocana
26	27.6.-4.7.	Marcelino

---- /!\ '''Edit conflict - other version:''' ----
27	4.7.-11.7.
28	11.7.-18.7.
29	18.7.-25.7.
30	25.7.-1.8.
31	1.8.-8.8.
32	8.8.-15.8.
33	15.8.-22.8.
34	22.8.-29.8.
35	29.8.-5.9.
36	5.9.-12.9.
37	12.9.-19.9.
38	19.9.-26.9.
39	26.9.-3.10.

$/!\$ Edit conflict - your version:

27; 4.7.-11.7.;; 28; 11.7.-18.7.;; 29; 18.7.-25.7.;; 30; 25.7.-1.8.;; 31; 1.8.-8.8.;; 32; 8.8.-15.8.;; 33; 15.8.-22.8.;; 34; 22.8.-29.8.;; 35; 29.8.-5.9.;; 36; 5.9.-12.9.; 37; 12.9.-19.9.;; 38; 19.9.-26.9.;; 39; 26.9.-3.10.;; }}}

$/!\$ End of edit conflict

-  ⇤ ← Revision 36 as of 2006-06-05 10:19:23 → 
  Size: 502
  Editor: visitor11
  Comment:
+   ← Revision 37 as of 2006-06-05 10:20:47 → ⇥
  Size: 1074
  Editor: visitor11
  Comment:
-Deletions are marked like this.
+Additions are marked like this.
 Line 10:
+---- /!\ '''Edit conflict - other version:''' ----
-Line 11:
+Line 13:
+---- /!\ '''Edit conflict - your version:''' ----
22; 30.5.-6.6.2006;Leon;

---- /!\ '''End of edit conflict''' ----
-Line 15:
+Line 22:
+---- /!\ '''Edit conflict - other version:''' ----
-Line 30:
+Line 39:
+---- /!\ '''Edit conflict - your version:''' ----
27; 4.7.-11.7.;;
28; 11.7.-18.7.;;
29; 18.7.-25.7.;;
30; 25.7.-1.8.;;
31; 1.8.-8.8.;;
32; 8.8.-15.8.;;
33; 15.8.-22.8.;;
34; 22.8.-29.8.;;
35; 29.8.-5.9.;;
36; 5.9.-12.9.;
37; 12.9.-19.9.;;
38; 19.9.-26.9.;;
39; 26.9.-3.10.;;
}}}

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