287 + property var recurrenceValue: [ RecurrenceRule.Invalid, 288 + RecurrenceRule.Daily, 289 + RecurrenceRule.Weekly, 290 + RecurrenceRule.Monthly, 291 + RecurrenceRule.Yearly]; 292 + 293 + property var recurrenceLabel: [ i18n.tr("Once"), 294 + i18n.tr("Daily"), 295 + i18n.tr("Weekly"), 296 + i18n.tr("Monthly"), 297 + i18n.tr("Yearly")];
This code also looks like from old branch. Please merge this changes as well.
« Back to merge proposal
287 + property var recurrenceValue: [ RecurrenceRule. Invalid, Daily, Weekly, Monthly, Yearly] ;
288 + RecurrenceRule.
289 + RecurrenceRule.
290 + RecurrenceRule.
291 + RecurrenceRule.
292 +
293 + property var recurrenceLabel: [ i18n.tr("Once"),
294 + i18n.tr("Daily"),
295 + i18n.tr("Weekly"),
296 + i18n.tr("Monthly"),
297 + i18n.tr("Yearly")];
This code also looks like from old branch. Please merge this changes as well.