From be1670ae9897cad12547f4a3ccf0143d19d01b14 Mon Sep 17 00:00:00 2001
From: kene17 <keneojukwu17@gmail.com>
Date: Wed, 7 Apr 2021 20:39:50 -0400
Subject: [PATCH] fixed

---
 public/assets/locales/en/translations.json | 32 ----------------------
 public/assets/locales/fr/translations.json | 30 --------------------
 2 files changed, 62 deletions(-)

diff --git a/public/assets/locales/en/translations.json b/public/assets/locales/en/translations.json
index 54441dd..8f6e961 100644
--- a/public/assets/locales/en/translations.json
+++ b/public/assets/locales/en/translations.json
@@ -23,43 +23,11 @@
     "Nav_Contact_Us": "Contact Us",
     "Nav_listing_page": "listing-page",
     "Nav_Login": "Login",
-<<<<<<< HEAD
     "View_Button": "View",
     "MeetTeam": "Meet the Team",
     "Sales_Ass":"sales assistant"
 
 
     
-=======
-    "Slogan_1": "YOU ARE NOT BUYING A HOUSE, ",
-    "Slogan_2": "YOU ARE BUYING A LIFESTYLE. ",
-    "Info": "Click for Details",
-    "Home1": "Welcome to Kene's Cribs. Kene's Cribs is a real estator company which provides the clients with the houses.",
-    "Home2": "The houses limited to the clients are only limited to the clients' dreams. In order to further navigate the",
-    "Home3": "website, use the navigation bar to switch between pages. Listings page is for browsing houses, Agents page",
-    "Home4": "is for browsing the estators, the Contact Us page is for the contacting us and the login page is for our",
-    "Home5": "members who want to benefit from our deals. Above are some houses which can interest you. Feel free to",
-    "Home6": "click the buttons above to explore the houses you want.",
-    "Desc": "Description",
-    "Rooms": "1 Bedroom, 2 Bathroom",
-    "Danger1": "Message could not send.",
-    "Danger2": "There are some errors in your contact form.",
-    "Success1": "The message is successfully sent.",
-    "Success2": "You contact form will be delivered to our support team.",
-    "Contact-Title": "Contact to Us",
-    "Contact-House": "Select an Agent",
-    "Contact-Agent": "Select a House",
-    "No-Pref": "No preference",
-    "Contact-First": "First Name",
-    "Contact-Last": "Last Name",
-    "Contact-Mail": "Email Address",
-    "Contact-Message": "Message",
-    "Contact-Submit": "Submit",
-    "Contact-Error1": "Please select an item in the list.",
-    "Contact-Error2": "Please fill out this field.",
-    "Contact-Error3": "Invalid email address."
-
-
->>>>>>> 540f8f4cac411d798ced6e126b65de938da68ad1
 
 }
\ No newline at end of file
diff --git a/public/assets/locales/fr/translations.json b/public/assets/locales/fr/translations.json
index 97f8b00..30d89db 100644
--- a/public/assets/locales/fr/translations.json
+++ b/public/assets/locales/fr/translations.json
@@ -23,37 +23,7 @@
     "Nav_Contact_Us": "Nous contacter",
     "Nav_listing_page": "page de liste",
     "Nav_Login": "Connexion",
-<<<<<<< HEAD
     "View_Button": "vue",
     "MeetTeam": "Rencontrer l'équipe",
     "Sales_Ass":"assistant des ventes"
-=======
-    "Slogan_1": "VOUS N'ACHETEZ PAS UNE MAISON, ",
-    "Slogan_2": "VOUS ACHETEZ UN STYLE DE VIE. ",
-    "Info": "Cliquer pour les détails",
-    "Home1": "Bienvenue chez Kene's Cribs. Kene's Cribs est une véritable société d'estateur qui fournit les maisons aux clients.",
-    "Home2": "Les maisons limitées aux clients ne se limitent qu'aux rêves des clients. Afin de mieux naviguer dans site Web, utilisez",
-    "Home3": "la barre de navigation pour basculer entre les pages. La page des listes sert à parcourir les maisons, la page Agents",
-    "Home4": "est pour parcourir les estators, la page Contactez-nous est pour nous contacter et la page de connexion est pour notre",
-    "Home5": "membres qui souhaitent bénéficier de nos offres. Ci-dessus, quelques maisons qui peuvent vous intéresser. N'hésitez",
-    "Home6": "pas à cliquez sur les boutons ci-dessus pour explorer les maisons que vous souhaitez.",
-    "Desc": "La Description",
-    "Rooms": "1 chambre, 2 salles de bains",
-    "Danger1": "Le message n'a pas pu être envoyé.",
-    "Danger2": "Il y a des erreurs dans votre formulaire de contact.",
-    "Success1": "Le message a été envoyé avec succès.",
-    "Success2": "Votre formulaire de contact sera envoyé à notre équipe d'assistance.",
-    "Contact-Title": "Contactez-Nous",
-    "Contact-House": "Sélectionnez un Agent",
-    "Contact-Agent": "Sélectionnez une Maison",
-    "No-Pref": "Aucune préférence",
-    "Contact-First": "Prénom",
-    "Contact-Last": "Nom de Famille",
-    "Contact-Mail": "Adresse E-mail",
-    "Contact-Message": "Le Message",
-    "Contact-Submit": "Soumettre",
-    "Contact-Error1": "Veuillez sélectionner un élément dans la liste.",
-    "Contact-Error2": "Veuillez remplir ce champ.",
-    "Contact-Error3": "Adresse e-mail invalide."
->>>>>>> 540f8f4cac411d798ced6e126b65de938da68ad1
 }
\ No newline at end of file