conflicts resolution

2025-11-26 15:00:21 +01:00
parent 48ccbb1c82 357af99564
commit 44446c6ad4
53 changed files with 620 additions and 296 deletions
--- a/frontend/pweb/lib/providers/two_factor.dart
+++ b/frontend/pweb/lib/providers/two_factor.dart
@@ -71,4 +71,4 @@ class TwoFactorProvider extends ChangeNotifier {
      notifyListeners();
    }
  }
-}
+}