fix: fix merge conflicts

thorsten · Apr 16, 2024 · 3f6524f · 3f6524f
1 parent 1ccaa07
commit 3f6524f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/phpmyfaq/assets/src/utils/cookie-consent.js b/phpmyfaq/assets/src/utils/cookie-consent.js
@@ -31,7 +31,6 @@ cc.run({
     // sameSite: "Lax",
     expiresAfterDays: 182,
   },
-
   guiOptions: {
     consentModal: {
       layout: 'box inline',

diff --git a/phpmyfaq/index.php b/phpmyfaq/index.php
@@ -672,7 +672,7 @@
             Strings::htmlentities($faqConfig->get('main.privacyURL')),
             Translation::get('msgPrivacyNote')
         ),
-        'cookiePreferences' => '<a id="showCookieConsent" class="pmf-nav-link-footer" href="#">'
+        'cookiePreferences' => '<a id="showCookieConsent" class="pmf-nav-link-footer">'
             . Translation::get('cookiePreferences') . '</a>',
         'faqOverview' => '<a class="pmf-nav-link-footer" href="index.php?' . $sids . 'action=overview">' .
             Translation::get('faqOverview') . '</a>',