Calander Schedule- After fixing the merge conflict

Author: jemex

src/ResourceManager/Automation/Commands.Automation/Model/Schedule.cs

@@ -112,7 +112,6 @@ public Schedule()
         public ScheduleFrequency Frequency { get; set; }
 
         /// <summary>
-<<<<<<< HEAD
         /// Gets or sets the schedule days of the week.
         /// </summary>
         public IList<string> DaysOfWeekWeeklySchedule { get; set; }
@@ -259,7 +258,7 @@ private IList<DaysOfMonth> GetDaysOfMonth(IList<int> daysOfMonth)
         {
             return daysOfMonth.Select(value => (DaysOfMonth)value).ToList();
         }
-=======
+        /// <summary>
         /// Gets or sets the schedule time zone.
         /// </summary>
         public string TimeZone { get; set; }

src/ServiceManagement/Automation/Commands.Automation/Model/Schedule.cs

@@ -45,7 +45,6 @@ public Schedule(string automationAccountName, WindowsAzure.Management.Automation
                                : this.NextRun;
             this.Interval = schedule.Properties.Interval.HasValue ? schedule.Properties.Interval.Value : this.Interval;
             this.Frequency = (ScheduleFrequency)Enum.Parse(typeof(ScheduleFrequency), schedule.Properties.Frequency, true);
-            this.TimeZone = schedule.Properties.TimeZone;
         }
 
         /// <summary>
@@ -109,10 +108,5 @@ public Schedule()
         /// Gets or sets the schedule frequency.
         /// </summary>
         public ScheduleFrequency Frequency { get; set; }
-
-        /// <summary>
-        /// Gets or sets the schedule time zone.
-        /// </summary>
-        public string TimeZone { get; set; }
     }
 }