Fix conflicts

flutter_quill_extensions/pubspec.yaml

@@ -19,10 +19,10 @@ dependencies:
   flutter:
     sdk: flutter
 
-  flutter_quill: ^7.5.0
+  # flutter_quill: ^7.5.0
   # In case you are working on changes for both libraries,
-  # flutter_quill:
+  flutter_quill:
-  #   path: ~/development/playground/framework_based/flutter/flutter-quill
+    path: /Users/ahmedhnewa/development/playground/framework_based/flutter/flutter-quill
 
   http: ^1.1.0
   image_picker: ">=1.0.4"

lib/src/models/config/toolbar/configurations.dart

@@ -91,8 +91,12 @@ class QuillToolbarButtonOptions extends Equatable {
     this.redoHistory = const QuillToolbarHistoryButtonOptions(
       isUndo: false,
     ),
+<<<<<<< HEAD
     this.fontFamily = const QuillToolbarFontFamilyButtonOptions(),
     // this.fontSize = const QuillToolbarFontSizeButtonOptions(),
+=======
+    this.fontFamilyButtonOptions = const QuillToolbarFontFamilyButtonOptions(),
+>>>>>>> 61b38f4 (Fix conflicts)
   });
 
   /// The base configurations for all the buttons which will apply to all