Fix merge conflict

pull/1596/head
Ellet 1 year ago
parent 1d7bad0e76
commit 5954ff5304
No known key found for this signature in database
GPG Key ID: C488CC70BBCEF0D1
  1. 4
      flutter_quill_extensions/pubspec.yaml
  2. 4
      flutter_quill_test/pubspec.yaml
  3. 7
      lib/src/widgets/toolbar/buttons/hearder_style/select_header_style_button.dart
  4. 1
      lib/src/widgets/toolbar/simple_toolbar.dart

@ -1,10 +1,6 @@
name: flutter_quill_extensions
description: Embed extensions for flutter_quill including image, video, formula and etc.
<<<<<<< HEAD
version: 9.0.2-dev
=======
version: 9.0.0
>>>>>>> upstream/master
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_extensions/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -1,10 +1,6 @@
name: flutter_quill_test
description: Test utilities for flutter_quill which includes methods to simplify interacting with the editor in test cases.
<<<<<<< HEAD
version: 9.0.2-dev
=======
version: 9.0.0
>>>>>>> upstream/master
homepage: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
repository: https://github.com/singerdmx/flutter-quill/tree/master/flutter_quill_test/
issue_tracker: https://github.com/singerdmx/flutter-quill/issues/

@ -1,18 +1,11 @@
import 'package:flutter/material.dart';
import '../../../../../translations.dart';
<<<<<<< HEAD
import '../../../../extensions/quill_configurations_ext.dart';
import '../../../../models/config/toolbar/buttons/select_header_style_button_configurations.dart';
import '../../../../models/documents/attribute.dart';
import '../../../../models/themes/quill_icon_theme.dart';
import '../../../quill/quill_controller.dart';
import '../../base_toolbar.dart';
=======
import '../../../../models/config/toolbar/buttons/select_header_style_configurations.dart';
import '../../../../models/documents/attribute.dart';
import '../../../quill/quill_controller.dart';
>>>>>>> upstream/master
enum _HeaderStyleOptions {
normal,

@ -8,7 +8,6 @@ import '../utils/provider.dart';
import 'base_toolbar.dart';
import 'buttons/alignment/select_alignment_buttons.dart';
import 'buttons/arrow_indicated_list_button.dart';
import 'buttons/hearder_style/select_header_style_button.dart';
class QuillSimpleToolbar extends StatelessWidget
implements PreferredSizeWidget {

Loading…
Cancel
Save