From 23ad8024ec64eea1354daf2e9c947bb25d586798 Mon Sep 17 00:00:00 2001
From: Lior Broshi <lior@binternet.co.il>
Date: Sun, 29 Dec 2019 23:03:10 +0200
Subject: [PATCH] resolved conflict
---
app/Config/app.php | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/Config/app.php b/app/Config/app.php
index 273e6febf..27978bd1d 100755
--- a/app/Config/app.php
+++ b/app/Config/app.php
@@ -52,7 +52,7 @@ return [
'locale' => env('APP_LANG', 'en'),
// Locales available
- 'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'he', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW'],
+ 'locales' => ['en', 'ar', 'de', 'de_informal', 'es', 'es_AR', 'fr', 'he', 'nl', 'pt_BR', 'sk', 'cs', 'sv', 'kr', 'ja', 'pl', 'it', 'ru', 'uk', 'zh_CN', 'zh_TW', 'tr'],
// Application Fallback Locale
'fallback_locale' => 'en',