Fix remaining stash issues by reverting to origin/dev

apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_logout.dart

@@ -3,14 +3,7 @@ import 'package:design_system/design_system.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_modular/flutter_modular.dart';
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-=======
 import 'package:krow_core/core.dart';
->>>>>>> Stashed changes
-=======
-import 'package:krow_core/core.dart';
->>>>>>> Stashed changes
 import '../../blocs/client_settings_bloc.dart';
 
 /// A widget that displays the log out button.
@@ -66,15 +59,7 @@ class SettingsLogout extends StatelessWidget {
           style: UiTypography.headline3m.textPrimary,
         ),
         content: Text(
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
-          'Are you sure you want to log out?',
-=======
           t.client_settings.profile.log_out_confirmation,
->>>>>>> Stashed changes
-=======
-          t.client_settings.profile.log_out_confirmation,
->>>>>>> Stashed changes
           style: UiTypography.body2r.textSecondary,
         ),
         actions: <Widget>[