Recover from failed merge conflict resolution

fredden · fredden · commit 4cca4c7df602 · 2021-11-27T13:02:50.000Z
diff --git a/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php b/app/code/Magento/Cron/Observer/ProcessCronQueueObserver.php
@@ -376,7 +376,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,
             cli_set_process_title($this->originalProcessTitle . " # group: $groupId, job: $jobCode");
         }
 
-        $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()));
+        $schedule->setExecutedAt(date('Y-m-d H:i:s', $this->dateTime->gmtTimestamp()));
         $this->retrier->execute(
             function () use ($schedule) {
                 $schedule->save();

Original file line number	Diff line number	Diff line change
`@@ -376,7 +376,7 @@ protected function _runJob($scheduledTime, $currentTime, $jobConfig, $schedule,`
`376`	`376`	`cli_set_process_title($this->originalProcessTitle . " # group: $groupId, job: $jobCode");`
`377`	`377`	`}`
`378`	`378`
`379`		`- $schedule->setExecutedAt(strftime('%Y-%m-%d %H:%M:%S', $this->dateTime->gmtTimestamp()));`
	`379`	`+ $schedule->setExecutedAt(date('Y-m-d H:i:s', $this->dateTime->gmtTimestamp()));`
`380`	`380`	`$this->retrier->execute(`
`381`	`381`	`function () use ($schedule) {`
`382`	`382`	`$schedule->save();`