resolve merge

content/collections/pages/home.md

@@ -5,11 +5,7 @@ title: Home
 template: home
 author: ab0729b7-bf3b-4b76-930d-938ff5d0a937
 updated_by: 0fe06f55-99d6-459d-8bfe-0ba1055ae246
-<<<<<<< HEAD
 updated_at: 1715047204
-=======
-updated_at: 1715047018
->>>>>>> 4f24304 (resolve merge)
 grid_field:
   - null
 home_section_1:
@@ -34,50 +30,29 @@ home_section_4:
     features:
       -
         id: ltwhom3l
-<<<<<<< HEAD
         highlight: 'Fields Booking and Fixtures 1'
         description_text: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Esse labore ullam error praesentium culpa quae similique, inventore laborum vel a excepturi odit voluptates illum quibusdam, commodi nostrum, tenetur perspiciatis est. Labore adipisci itaque inventore voluptatem pariatur? Quos perferendis sit quo autem praesentium nobis pariatur in! Atque, explicabo magnam! Repellat aliquam dolorem suscipit nam facere'
         icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db pe-4 d-none d-lg-inline"></i>'
         link_text: 'Download Now'
-=======
-        highlight: 'Field Booking and Fixtures'
-        description_text: 'You can select from our massive database of football fields and book at any preferred date and time, anywhere, anytime within a tap of a button through your mobile phone.'
-        icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db d-none d-lg-inline"></i>'
-        link_text: 'Book Now'
->>>>>>> 4f24304 (resolve merge)
         link: /booking
         background_image: group-6742.jpg
         type: feature
         enabled: true
       -
         id: ltwiiwib
-<<<<<<< HEAD
         highlight: 'Fields Booking and Fixtures 2'
         description_text: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Esse labore ullam error praesentium culpa quae similique, inventore laborum vel a excepturi odit voluptates illum quibusdam, commodi nostrum, tenetur perspiciatis est.'
         icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db pe-4 d-none d-lg-inline"></i>'
         link_text: 'Download Now'
         link: /download
-=======
-        highlight: 'Create and Join Match'
-        description_text: 'You can relay on our amazing features list and also our customer services will be great experience.'
-        icon: '<i class="fa-solid fa-gamepad fa-2x text-db d-none d-lg-inline"></i>'
-        link_text: 'Read Our News'
-        link: /news
->>>>>>> 4f24304 (resolve merge)
         background_image: group-6741.jpg
         type: feature
         enabled: true
       -
         id: ltwijpnf
-<<<<<<< HEAD
         highlight: 'Fields Booking and Fixtures 3'
         description_text: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Esse labore ullam error praesentium culpa quae similique, inventore laborum vel a excepturi odit voluptates illum quibusdam, commodi nostrum, tenetur perspiciatis est.'
         icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db pe-4 d-none d-lg-inline"></i>'
-=======
-        highlight: 'Create Team (Coming Soon)'
-        description_text: 'Create your own team and invite your friends to be your team member. Find another team and request for a match'
-        icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db d-none d-lg-inline"></i>'
->>>>>>> 4f24304 (resolve merge)
         link_text: 'Download Now'
         link: /download
         background_image: group-6743.jpg
@@ -85,19 +60,11 @@ home_section_4:
         enabled: true
       -
         id: ltwikvv9
-<<<<<<< HEAD
         highlight: 'Fields Booking and Fixtures 4'
         description_text: 'Lorem ipsum dolor sit amet consectetur adipisicing elit. Esse labore ullam error praesentium culpa quae similique, inventore laborum vel a excepturi odit voluptates illum quibusdam, commodi nostrum, tenetur perspiciatis est.'
         icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db pe-4 d-none d-lg-inline"></i>'
         link_text: 'Download Now'
         link: /news
-=======
-        highlight: 'Create Match'
-        description_text: 'Join a match or create one yourself, and invite your friends either to be in your team or as an opponent. Enjoy the game'
-        icon: '<i class="fa-solid fa-book-bookmark fa-2x text-db d-none d-lg-inline"></i>'
-        link_text: 'Begin Your Match'
-        link: /download
->>>>>>> 4f24304 (resolve merge)
         background_image: group-6773-1710740276.jpg
         type: feature
         enabled: true