v5.5.48

app/Models/PaymentType.php

@@ -55,11 +55,8 @@ class PaymentType extends StaticModel
     const ACSS = 44;
     const INSTANT_BANK_PAY = 45;
     const FPX = 46;
-<<<<<<< HEAD
-=======
     const KLARNA = 47;
     const Interac_E_Transfer = 48;
->>>>>>> v5-develop
 
     public static function parseCardType($cardName)
     {

app/PaymentDrivers/StripePaymentDriver.php

@@ -98,10 +98,7 @@ class StripePaymentDriver extends BaseDriver
         GatewayType::BECS => BECS::class,
         GatewayType::ACSS => ACSS::class,
         GatewayType::FPX => FPX::class,
-<<<<<<< HEAD
-=======
         GatewayType::KLARNA => Klarna::class,
->>>>>>> v5-develop
     ];
 
     const SYSTEM_LOG_TYPE = SystemLog::TYPE_STRIPE;

lang/en/texts.php

@@ -4778,13 +4778,8 @@ $LANG = array(
     'invoice_task_project' => 'Invoice Task Project',
     'invoice_task_project_help' => 'Add the project to the invoice line items',
     'bulk_action' => 'Bulk Action',
-<<<<<<< HEAD
-    'phone_validation_error' => 'This mobile/cell phone number is not valid, please enter in E.164 format',
-    'transaction' => 'Transaction',    
-=======
     'phone_validation_error' => 'This mobile (cell) phone number is not valid, please enter in E.164 format',
     'transaction' => 'Transaction',
->>>>>>> v5-develop
     'disable_2fa' => 'Disable 2FA',
     'change_number' => 'Change Number',
     'resend_code' => 'Resend Code',