From 94a06734a038189aabf253fcd845714955277390 Mon Sep 17 00:00:00 2001
From: Neeraj Gupta <254676+ua741@users.noreply.github.com>
Date: Thu, 9 Jun 2022 19:11:44 +0530
Subject: [PATCH] Fix merge conflic

---
 lib/services/feature_flag_service.dart | 19 ++-----------------
 1 file changed, 2 insertions(+), 17 deletions(-)

diff --git a/lib/services/feature_flag_service.dart b/lib/services/feature_flag_service.dart
index 7ce0e8cd7..47289cae4 100644
--- a/lib/services/feature_flag_service.dart
+++ b/lib/services/feature_flag_service.dart
@@ -103,19 +103,8 @@ class FeatureFlags {
   static FeatureFlags defaultFlags = FeatureFlags(
       disableCFWorker: FFDefault.disableCFWorker,
       disableUrlSharing: FFDefault.disableUrlSharing,
-      enableStripe: FFDefault.enableStripe);
-<<<<<<< HEAD
-
-  final bool disableCFWorker;
-  final bool disableUrlSharing;
-  final bool enableStripe;
-
-  FeatureFlags({
-    @required this.disableCFWorker,
-    @required this.disableUrlSharing,
-    @required this.enableStripe,
-  });
-=======
+      enableStripe: FFDefault.enableStripe,
+      enableMissingLocationMigration: FFDefault.enableMissingLocationMigration);
 
   final bool disableCFWorker;
   final bool disableUrlSharing;
@@ -127,7 +116,6 @@ class FeatureFlags {
       @required this.disableUrlSharing,
       @required this.enableStripe,
       @required this.enableMissingLocationMigration});
->>>>>>> master
 
   Map<String, dynamic> toMap() {
     return {
@@ -149,11 +137,8 @@ class FeatureFlags {
       disableUrlSharing:
           json["disableUrlSharing"] ?? FFDefault.disableUrlSharing,
       enableStripe: json["enableStripe"] ?? FFDefault.enableStripe,
-<<<<<<< HEAD
-=======
       enableMissingLocationMigration: json["enableMissingLocationMigration"] ??
           FFDefault.enableMissingLocationMigration,
->>>>>>> master
     );
   }