Fix stash conflict
This commit is contained in:
@@ -4,9 +4,13 @@ import '../repositories/client_create_order_repository_interface.dart';
|
||||
|
||||
/// Use case for creating a permanent staffing order.
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
|
||||
class CreatePermanentOrderUseCase implements UseCase<PermanentOrder, void> {
|
||||
=======
|
||||
class CreatePermanentOrderUseCase implements UseCase<Future<void>, PermanentOrder> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
|
||||
=======
|
||||
class CreatePermanentOrderUseCase implements UseCase<Future<void>, PermanentOrder> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_permanent_order_usecase.dart
|
||||
const CreatePermanentOrderUseCase(this._repository);
|
||||
|
||||
|
||||
@@ -4,9 +4,13 @@ import '../repositories/client_create_order_repository_interface.dart';
|
||||
|
||||
/// Use case for creating a recurring staffing order.
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
|
||||
class CreateRecurringOrderUseCase implements UseCase<RecurringOrder, void> {
|
||||
=======
|
||||
class CreateRecurringOrderUseCase implements UseCase<Future<void>, RecurringOrder> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
|
||||
=======
|
||||
class CreateRecurringOrderUseCase implements UseCase<Future<void>, RecurringOrder> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/create_recurring_order_usecase.dart
|
||||
const CreateRecurringOrderUseCase(this._repository);
|
||||
|
||||
|
||||
@@ -14,9 +14,13 @@ class ReorderArguments {
|
||||
|
||||
/// Use case for reordering an existing staffing order.
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/reorder_usecase.dart
|
||||
<<<<<<< Updated upstream:apps/mobile/packages/features/client/orders/create_order/lib/src/domain/usecases/reorder_usecase.dart
|
||||
class ReorderUseCase implements UseCase<ReorderArguments, void> {
|
||||
=======
|
||||
class ReorderUseCase implements UseCase<Future<void>, ReorderArguments> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/reorder_usecase.dart
|
||||
=======
|
||||
class ReorderUseCase implements UseCase<Future<void>, ReorderArguments> {
|
||||
>>>>>>> Stashed changes:apps/mobile/packages/features/client/create_order/lib/src/domain/usecases/reorder_usecase.dart
|
||||
const ReorderUseCase(this._repository);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user