Fix stash conflict
This commit is contained in:
@@ -4,6 +4,10 @@ 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
|
||||
@@ -62,8 +66,12 @@ 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
|
||||
|
||||
Reference in New Issue
Block a user