Fix stash conflict

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

@@ -26,8 +26,12 @@ 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

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

@@ -1,22 +1,31 @@
 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,
@@ -25,6 +34,7 @@ class RecurringOrder extends Equatable {
     this.roleRates = const <String, double>{},
   });
 
+<<<<<<< Updated upstream
 <<<<<<< Updated upstream
   /// Start date for the recurring schedule.
   final DateTime startDate;
@@ -60,6 +70,8 @@ class RecurringOrder extends Equatable {
         recurringDays,
         location,
 =======
+=======
+>>>>>>> Stashed changes
   final DateTime startDate;
   final DateTime endDate;
   
@@ -77,6 +89,9 @@ class RecurringOrder extends Equatable {
         startDate,
         endDate,
         recurringDays,
+<<<<<<< Updated upstream
+>>>>>>> Stashed changes
+=======
 >>>>>>> Stashed changes
         positions,
         hub,
@@ -86,6 +101,7 @@ class RecurringOrder extends Equatable {
       ];
 }
 <<<<<<< Updated upstream
+<<<<<<< Updated upstream
 
 /// Minimal hub details used during recurring order creation.
 class RecurringOrderHubDetails extends Equatable {
@@ -132,3 +148,5 @@ class RecurringOrderHubDetails extends Equatable {
 }
 =======
 >>>>>>> Stashed changes
+=======
+>>>>>>> Stashed changes