Fix queue rebase marker

dereuromark · dereuromark · commit e84f37071a06 · 2026-05-25T15:34:03.000+02:00
diff --git a/src/Model/Table/QueuedJobsTable.php b/src/Model/Table/QueuedJobsTable.php
@@ -267,11 +267,7 @@ public function createJob(string $jobTask, array|object|null $data = null, array
 	 *
 	 * @return string
 	 */
-<<<<<<< HEAD
 	protected function jobTask(string $jobType): string {
-=======
-	protected function jobTask(string $jobType): string {
->>>>>>> e852801 (Address queue review follow-ups)
 		if (!($this->taskFinder instanceof TaskFinder)) {
 			$this->taskFinder = new TaskFinder();
 		}

Original file line number	Diff line number	Diff line change
`@@ -267,11 +267,7 @@ public function createJob(string $jobTask, array\|object\|null $data = null, array`
`267`	`267`	`*`
`268`	`268`	`* @return string`
`269`	`269`	`*/`
`270`		`-<<<<<<< HEAD`
`271`	`270`	`protected function jobTask(string $jobType): string {`
`272`		`-=======`
`273`		`- protected function jobTask(string $jobType): string {`
`274`		`->>>>>>> e852801 (Address queue review follow-ups)`
`275`	`271`	`if (!($this->taskFinder instanceof TaskFinder)) {`
`276`	`272`	`$this->taskFinder = new TaskFinder();`
`277`	`273`	`}`