👷: tests for ci githubaction

B3-3iL-DLW · Mar 7, 2024 · 2986387 · 2986387
1 parent 3d70594
commit 2986387
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/backend/src/Controller/Api/TimetableController.php b/backend/src/Controller/Api/TimetableController.php
@@ -31,11 +31,7 @@ public function index(Request $request): JsonResponse
             $parsedJson = $this->timetableService->fetchAndParseData($xmlUrl);
             return $this->json($parsedJson);
         } else {
-<<<<<<< HEAD
             return $this->json(['error' => 'Invalid XML url'], JsonResponse::HTTP_BAD_REQUEST);
-=======
-            return $this->json(['error' => 'Invalid xml url'], JsonResponse::HTTP_BAD_REQUEST);
->>>>>>> dev
         }
     }
 }