2ndbeam/fluffychat-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

resolve merge conflicts

Browse source
This commit is contained in:
ggurdin 2025-05-23 09:26:13 -04:00
commit 87c2639625
No known key found for this signature in database
GPG key ID: A01CB41737CBB478
244 changed files with 129907 additions and 129978 deletions
Download patch file Download diff file Expand all files Collapse all files

2
lib/pages/settings_style/settings_style_view.dart
View file

@ -3,11 +3,11 @@ import 'dart:ui';
import 'package:flutter/material.dart';
import 'package:dynamic_color/dynamic_color.dart';
import 'package:flutter_gen/gen_l10n/l10n.dart';
import 'package:matrix/matrix.dart';
import 'package:fluffychat/config/setting_keys.dart';
import 'package:fluffychat/config/themes.dart';
import 'package:fluffychat/l10n/l10n.dart';
import 'package:fluffychat/pages/chat/events/state_message.dart';
import 'package:fluffychat/utils/account_config.dart';
import 'package:fluffychat/utils/color_value.dart';