merge

2024-04-24 17:49:55 +02:00
parent e3609deb5f
commit 3f61b740b8
4 changed files with 3 additions and 106 deletions
--- a/lib/addCam/add_cam_main.dart
+++ b/lib/addCam/add_cam_main.dart
@@ -256,10 +256,6 @@ class _AddCamMainState extends State<AddCamMain> {
                  child: Text(AppLocalizations.of(context)!.template)),
              TextButton(
                  onPressed: () async {
-<<<<<<< HEAD
-                    saveData();
-=======
->>>>>>> d6ae86598dd9d031af9fe29680dc050c5bb2946f
                    _httpRequest();
                    saveData();
                    Navigator.pushNamedAndRemoveUntil(