Fix remaining stash issues by reverting to origin/dev

apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart

@@ -26,15 +26,7 @@ class PermanentOrder extends Equatable {
   final Map<String, double> roleRates;
 
   @override
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
   List<Object?> get props => <Object?>[
-=======
-  List<Object?> get props => [
->>>>>>> Stashed changes
-=======
-  List<Object?> get props => [
->>>>>>> Stashed changes
         startDate,
         permanentDays,
         positions,

apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart

@@ -1,32 +1,13 @@
 import 'package:equatable/equatable.dart';
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
 import 'recurring_order_position.dart';
 
 /// Represents a recurring staffing request spanning a date range.
-=======
-=======
->>>>>>> Stashed changes
-import 'one_time_order.dart';
-import 'one_time_order_position.dart';
-
-/// Represents a customer's request for recurring staffing.
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
 class RecurringOrder extends Equatable {
   const RecurringOrder({
     required this.startDate,
     required this.endDate,
     required this.recurringDays,
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
     required this.location,
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
     required this.positions,
     this.hub,
     this.eventName,
@@ -34,8 +15,6 @@ class RecurringOrder extends Equatable {
     this.roleRates = const <String, double>{},
   });
 
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
   /// Start date for the recurring schedule.
   final DateTime startDate;
 
@@ -69,30 +48,6 @@ class RecurringOrder extends Equatable {
         endDate,
         recurringDays,
         location,
-=======
-=======
->>>>>>> Stashed changes
-  final DateTime startDate;
-  final DateTime endDate;
-  
-  /// List of days (e.g., ['Monday', 'Wednesday']) or bitmask.
-  final List<String> recurringDays;
-  
-  final List<OneTimeOrderPosition> positions;
-  final OneTimeOrderHubDetails? hub;
-  final String? eventName;
-  final String? vendorId;
-  final Map<String, double> roleRates;
-
-  @override
-  List<Object?> get props => [
-        startDate,
-        endDate,
-        recurringDays,
-<<<<<<< Updated upstream
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes
         positions,
         hub,
         eventName,
@@ -100,8 +55,6 @@ class RecurringOrder extends Equatable {
         roleRates,
       ];
 }
-<<<<<<< Updated upstream
-<<<<<<< Updated upstream
 
 /// Minimal hub details used during recurring order creation.
 class RecurringOrderHubDetails extends Equatable {
@@ -146,7 +99,3 @@ class RecurringOrderHubDetails extends Equatable {
         zipCode,
       ];
 }
-=======
->>>>>>> Stashed changes
-=======
->>>>>>> Stashed changes