beenull/ente
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix merge conflic

Browse source
This commit is contained in:
Neeraj Gupta 2022-06-09 19:11:44 +05:30
parent 8e093df793
commit 94a06734a0
No known key found for this signature in database
GPG key ID: 3C5A1684DC1729E1
1 changed files with 2 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lib/services/feature_flag_service.dart
View file

@ -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
);
}