chore: merge conflict resolution

Author: Usmanfee

src/assets/locales/de/main.json

@@ -1281,11 +1281,7 @@
         "providerPhoneContact": "Provider Phone Contact",
         "pleaseEnterValidHomePageURL": "Please enter a valid url - eg: https://catena-x.net",
         "pleaseEnterValidEmail": "Please enter a valid Customer Contact E-Mail",
-<<<<<<< HEAD
         "pleaseEnterValidPhone": "Bitte geben Sie eine gültige Kundenkontakt Telefonnummer ein",
-=======
-        "pleaseEnterValidPhone": "Please enter a valid Customer Contact Number",
->>>>>>> e39c0f9e (new: introduced new field of customer contact in service)
         "pleaseEnterValidContact": "Bitte fügen Sie eine gültige Telefonnummer im folgenden Format hinzu: „+ xx xxxx xxxxxx“, „+ xxx xxxx-xxxx“, „+xx xxxxxxxxxx“. Hinweis: Es sind weitere Formate zulässig. Die genannten Formate sind die am häufigsten verwendeten Formate.",
         "privacyInformation": "Privacy Information",
         "privacyInformationDescription": "The privacy information is used to display data types the app may collect on the app detail page. You may select several options OR select “none”.",

src/assets/locales/en/servicerelease.json

@@ -53,11 +53,7 @@
     "providerContactPhone": "Customer Contact Phone",
     "pleaseEnterValidHomePageURL": "Please enter a valid url - eg: https://catena-x.net",
     "pleaseEnterValidEmail": "Please enter a valid Customer Contact E-Mail",
-<<<<<<< HEAD
     "pleaseEnterValidPhone": "Please enter a valid Customer Contact Phone Number"
-=======
-    "pleaseEnterValidPhone": "Please enter a valid Customer Contact Phonenumber"
->>>>>>> e39c0f9e (new: introduced new field of customer contact in service)
   },
   "step3": {
     "headerTitle": "Agreements and Consent",

src/components/pages/ServiceReleaseProcess/ServiceOverview/ServiceDetails.tsx

@@ -271,12 +271,8 @@ export default function ServiceDetails() {
                   body: [
                     [fetchServiceStatus?.providerUri],
                     [fetchServiceStatus?.contactEmail],
-<<<<<<< HEAD
                     // TODO: contactNumber is null atm and causing build failure. Once BE resolve the issue then will un-comment this line
                     // [fetchServiceStatus?.contactNumber],
-=======
-                    [fetchServiceStatus?.contactNumber],
->>>>>>> e39c0f9e (new: introduced new field of customer contact in service)
                   ],
                 }}
                 horizontal={true}

src/types/Patterns.test.ts

@@ -33,7 +33,6 @@ import {
   isValidAppOverviewSearch,
   isValidIDPName,
   isValidPhone,
-  isValidAppOverviewSearch,
 } from './Patterns'
 
 const TESTDATA = {