fix: resolved conflicts

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dart.flutterSdkPath": "C:\\flutter"
+}

backend/src/Controller/Api/TimetableController.php

@@ -31,7 +31,11 @@ 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
         }
     }
 }

frontend/app_student/.fvmrc

@@ -0,0 +1,3 @@
+{
+  "flutter": "3.19.2"
+}

frontend/app_student/.gitignore

@@ -41,3 +41,6 @@ app.*.map.json
 /android/app/debug
 /android/app/profile
 /android/app/release
+
+# FVM Version Cache
+.fvm/

frontend/app_student/.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+  "dart.flutterSdkPath": ".fvm\\versions\\3.19.2"
+}