@@ -42,6 +42,7 @@ The API currently supports translations for the following resource types, and mo
4242* [ Product Filters] ( /docs/store-operations/translations/filters )
4343* [ Locations] ( /docs/store-operations/translations/locations )
4444<<<<<<< HEAD
45+ <<<<<<< HEAD
4546>>>>>>> f825f0b9 (DEVDOCS-6666 - Update translation resource names for consistency (#1210 ))
4647<<<<<<< HEAD
4748>>>>>>> cefd62e6 (DEVDOCS-6666 - Update translation resource names for consistency (#1210 ))
@@ -51,7 +52,15 @@ The API currently supports translations for the following resource types, and mo
5152* [ Customer Form Fields] ( /docs/store-operations/translations/customer-form-fields )
5253* [ Address Form Fields] ( /docs/store-operations/translations/address-form-fields )
5354>>>>>>> 7435296c (Add documentation for Checkout Settings and Form Fields translations)
55+ <<<<<<< HEAD
5456>>>>>>> e49ae7db (Add documentation for Checkout Settings and Form Fields translations)
57+ =======
58+ =======
59+ * [ Address Form Fields] ( /docs/store-operations/translations/address-form-fields )
60+ * [ Customer Form Fields] ( /docs/store-operations/translations/customer-form-fields )
61+ * [ Checkout Settings] ( /docs/store-operations/translations/checkout-settings )
62+ >>>>>>> 155f4ae3 (Reorder navigation: Address Form Fields, Customer Form Fields, Checkout Settings)
63+ >>>>>>> f84813c2 (Reorder navigation: Address Form Fields, Customer Form Fields, Checkout Settings)
5564
5665Refer to the [ Error Handling] ( /docs/store-operations/translations/errors ) guide for understanding and handling errors while managing translations.
5766
@@ -113,10 +122,16 @@ For more information on OAuth Scopes, see our [Guide to API Accounts](/docs/star
113122- [ Product Filter Translations] ( /docs/store-operations/translations/filters )
114123- [ Inventory Locations Translations] ( /docs/store-operations/translations/locations )
115124<<<<<<< HEAD
125+ <<<<<<< HEAD
116126- [Payment Method Translations](/docs/store-operations/translations/payments)
117127=======
118128- [Checkout Settings Translations](/docs/store-operations/translations/checkout-settings)
119129- [Customer Form Fields Translations](/docs/store-operations/translations/customer-form-fields)
120130- [Address Form Fields Translations](/docs/store-operations/translations/address-form-fields)
121131>>>>>>> 7435296c (Add documentation for Checkout Settings and Form Fields translations)
132+ =======
133+ - [ Address Form Fields Translations] ( /docs/store-operations/translations/address-form-fields )
134+ - [ Customer Form Fields Translations] ( /docs/store-operations/translations/customer-form-fields )
135+ - [ Checkout Settings Translations] ( /docs/store-operations/translations/checkout-settings )
136+ >>>>>>> 155f4ae3 (Reorder navigation: Address Form Fields, Customer Form Fields, Checkout Settings)
122137- [ Error Handling Reference] ( /docs/store-operations/translations/errors )
0 commit comments