From 1684da0466820dc5237ba20150da91dbae8ec55e Mon Sep 17 00:00:00 2001
From: Terry Crapts <terry.crapts@ictu.nl>
Date: Tue, 6 Dec 2022 15:58:22 +0000
Subject: [PATCH] Resolve "Volgorde footer wijzigen"

---
 frontend/components/views/AppFooter.vue | 6 ++++++
 frontend/locales/en.json                | 4 ++++
 frontend/locales/nl.json                | 4 ++++
 3 files changed, 14 insertions(+)

diff --git a/frontend/components/views/AppFooter.vue b/frontend/components/views/AppFooter.vue
index 964deb55..fdc64b2f 100644
--- a/frontend/components/views/AppFooter.vue
+++ b/frontend/components/views/AppFooter.vue
@@ -2,10 +2,16 @@
   <div class="footer row--footer" role="contentinfo">
     <div class="container columns">
       <div>
+<<<<<<< HEAD
+        {{ t('footer.text') }}&nbsp;<NuxtLink :to="'/footer/over'">{{
+          t('footer.textAskApply')
+        }}</NuxtLink>
+=======
         {{ t('footer.text') }} {{ t('footer.textAskApply') }} '<NuxtLink
           :to="'footer/over'"
           >{{ t('footer.paths.over') }}</NuxtLink
         >'.
+>>>>>>> main
       </div>
       <div></div>
       <div v-for="footerKey in footerKeys" :key="footerKey">
diff --git a/frontend/locales/en.json b/frontend/locales/en.json
index d8a18c18..0bb464bc 100644
--- a/frontend/locales/en.json
+++ b/frontend/locales/en.json
@@ -9,7 +9,11 @@
   "noResults": "No algorithm was found for this search request.",
   "footer": {
     "text": "Note: this website is under development. Information will change often. Do you want to help?",
+<<<<<<< HEAD
+    "textAskApply": "Please apply.",
+=======
     "textAskApply": "Please apply at",
+>>>>>>> main
     "paths": {
       "algoritme": "Overview",
       "over": "About this website",
diff --git a/frontend/locales/nl.json b/frontend/locales/nl.json
index 9097ec8a..f347fd3b 100644
--- a/frontend/locales/nl.json
+++ b/frontend/locales/nl.json
@@ -9,7 +9,11 @@
   "noResults": "Geen algoritmes gevonden voor de huidige zoekopdracht.",
   "footer": {
     "text": "Let op: deze website is in ontwikkeling. De informatie verandert vaak. Wil je meehelpen?",
+<<<<<<< HEAD
+    "textAskApply": "Meld je dan aan.",
+=======
     "textAskApply": "Meld je aan bij",
+>>>>>>> main
     "paths": {
       "algoritme": "Algoritmeoverzicht",
       "over": "Over deze website",