Correct merge

This commit is contained in:
Hillel Coren 2018-05-09 10:16:17 +03:00
parent f9aee9b7fc
commit 9a75918e94

View File

@ -268,7 +268,7 @@
}, },
}, },
"content": { "content": {
"href": "{{ Utils::isNinja() ? Utils::getPrivacyLink() : (config('ninja.privacy_policy_url') ?: 'https://cookiesandyou.com/' ) }}", "href": "{{ Utils::isNinja() ? config('ninja.privacy_policy_url') : 'https://cookiesandyou.com/' }}",
"message": {!! json_encode(trans('texts.cookie_message')) !!}, "message": {!! json_encode(trans('texts.cookie_message')) !!},
"dismiss": {!! json_encode(trans('texts.got_it')) !!}, "dismiss": {!! json_encode(trans('texts.got_it')) !!},
"link": {!! json_encode(trans('texts.learn_more')) !!}, "link": {!! json_encode(trans('texts.learn_more')) !!},