merge conflect

This commit is contained in:
Abdalhamid Alhamad
2026-01-06 12:57:13 +03:00
parent 2562515574
commit 2f74aa36a9

View File

@ -6,11 +6,8 @@ export * from './1757433339849-add-reservation-amount-to-account-entity';
export * from './1757915357218-add-deleted-at-column-to-junior';
export * from './1760869651296-AddMerchantInfoToTransactions';
export * from './1761032305682-AddUniqueConstraintToUserEmail';
<<<<<<< HEAD
export * from './1767172707881-AddDataColumnToNotifications';
=======
export * from './1765804942393-AddKycFieldsAndTransactions';
export * from './1765877128065-AddNationalIdToKycTransactions';
export * from './1765891028260-RemoveOldCustomerColumns';
export * from './1765975126402-RemoveAddressColumns';
>>>>>>> d77d59a79376e186354205e64efb2c793e5aae91