commit merge resolution

_data/home.yml

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # This file is sitewide, for all languages.
 # To specify per-language data, use the _i18n folder's yml files.
 
@@ -7,37 +6,6 @@ app_tiles_image: '/assets/images/butter-collection-features-offline-essentials.s
 
 modal:
   butter_app_logo: '/assets/images/butter-app-icon-large.svg'
-=======
-site_name: 'Butter'
-page_logo: ['/assets/images/butter-logo-feature-large.svg', 'Butter App Feature Logo']
-title: 'Life without internet made smoother. <br /> Get access to tools that help.'
-text:
-  show_chat: |
-    This Butter Box offers an Android app store and chat rooms. <br />
-    Download the Butter app to discover and download free, ad-free <br />
-    apps or to spread the love and share apps offline. Or, create a <br />
-    chat room which hangs on to messages while you're gone and <br/>
-    delivers them whenever your device reconnects to the Butter Box.
-  dont_show_chat: |
-    Butter features a collection of apps to make life without <br /> the internet a little smoother.  Use it to discover and download <br /> free, ad-free apps or to spread the love and share offline.
-fdroid_apps_caption: Just a few of the apps available via Butter.
-fdroid_button_text: 'Download Android App'
-chat_button_text: 'Start a chat room instantly'
-image: ['/assets/images/butter-collection-features-offline-essentials.svg', 'Butter App features collection']
-
-modal_data:
-  title: 'Butter: Free, ad-free apps to help you offline'
-  logo: ['/assets/images/butter-app-icon-large.svg', 'Butter App Logo']
-  text: |
-    Be in-the-know, be entertained, manage business and life—even with little internet.
-    Butter app makes it easy to find apps that use less internet and battery.
-    Download your favorites, and get free updates from Butter. Care to share? Send any app on your phone to a friend near you with Butter nearby. No internet needed.
-  info_list:
-    - By Team Butter
-    - Available for Android phones
-    - Less than 10 MB!
-  button_text: 'Download Android App'
->>>>>>> master
   button_url: '/assets/download/butter.apk'
   slider_list:
     - '/assets/images/slide-img-1.png'