From c03692e0e20033b0fd584b5d25a782227bbf6cb8 Mon Sep 17 00:00:00 2001 From: LU XIN Date: Thu, 4 May 2023 03:37:41 +0800 Subject: [PATCH] Update --- config/pages/home/use-section-two.ts | 17 +++-------------- locales/en-UK.json | 28 ++++------------------------ 2 files changed, 7 insertions(+), 38 deletions(-) diff --git a/config/pages/home/use-section-two.ts b/config/pages/home/use-section-two.ts index 69cd515..11bd132 100644 --- a/config/pages/home/use-section-two.ts +++ b/config/pages/home/use-section-two.ts @@ -3,25 +3,14 @@ export function useSectionTwo() { title: 'home.sectionTwo.title', content: [ { -<<<<<<< Updated upstream - img: 'https://landvault.io/assets/logos/paypal.svg', - href: '#', - title: 'home.sectionTwo.content.title[0]', + img: 'https://muadao.build/assets/logo.7c101bb2.svg', + href: 'https://muadao.build/', + title: 'MUA DAO', }, { img: 'https://landvault.io/assets/logos/paypal.svg', href: '#', title: 'home.sectionTwo.content.title[1]', -======= - img: 'https://muadao.build/assets/logo.7c101bb2.svg', - href: 'https://muadao.build/', - title: 'MUA', - }, - { - img: 'https://ir.china-tower.com/en/images/global/logo.svg', - href: 'https://www.china-tower.com/index', - title: 'ChinaTower', ->>>>>>> Stashed changes }, { img: 'https://landvault.io/assets/logos/paypal.svg', diff --git a/locales/en-UK.json b/locales/en-UK.json index 810b909..94c7d4b 100644 --- a/locales/en-UK.json +++ b/locales/en-UK.json @@ -26,34 +26,16 @@ "link": ["Details", "Details"] }, "sectionOne": { -<<<<<<< Updated upstream - "topic": "Your End-To-End Metaverse Developers", + "topic": "World-Leading Metaverse Creators and AR/VR/MR Developers", "content": { "title": ["80+", "20+", "2 Million+"], "subtext": ["Metaverse Experts & Engineers", "Completed Builds & Inventions", "Square Meters Developed"], "description": ["We have been developing in metaverse since 2021", "Architects, Developers, Producers, amd more", "in both virtual and IRL scales"] -======= - "topic": "World-Leading Metaverse Creators and AR/VR/MR Developers", - "one":{ - "title":"80+", - "subtext":"Metaverse Experts & Engineers", - "description":"Architects, Developers, Producers, amd more" - }, - "two":{ - "title":"20+", - "subtext":"Completed Builds & Inventions", - "description":"We have been developing in metaverse since 2021" - }, - "three":{ - "title":"2 Million+", - "subtext":"Square Meters Developed", - "description":"in both virtual and IRL scales" ->>>>>>> Stashed changes + } }, "sectionTwo": { -<<<<<<< Updated upstream - "title": "some of our clients", + "title": "Our Partners & Cooperations", "content": { "title": [ "pay", @@ -65,9 +47,7 @@ "pay" ] } -======= - "title": "Our Partners & Cooperations" ->>>>>>> Stashed changes + }, "sectionThree": { "title": "OUR PREVIOUS WORK",