This commit is contained in:
Mohd Arief
2018-05-21 12:45:54 +08:00
parent 97f00bf724
commit b2fc9f8605
3 changed files with 6 additions and 9 deletions
+1 -1
View File
@@ -65,7 +65,7 @@ return [
'charset' => 'utf8mb4', 'charset' => 'utf8mb4',
'collation' => 'utf8mb4_unicode_ci', 'collation' => 'utf8mb4_unicode_ci',
'prefix' => '', 'prefix' => '',
'strict' => true, 'strict' => false,
'engine' => null, 'engine' => null,
], ],
-3
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
APP_NAME=IZYIM APP_NAME=IZYIM
APP_ENV=local APP_ENV=local
APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
@@ -38,7 +37,6 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
=======
APP_NAME=exchange APP_NAME=exchange
APP_ENV=local APP_ENV=local
APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ= APP_KEY=base64:Fu2YulXExzm9HJ5LgVmZUmcbRkchHkc82q02MorN5GQ=
@@ -78,4 +76,3 @@ PUSHER_APP_CLUSTER=mt1
MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}" MIX_PUSHER_APP_KEY="${PUSHER_APP_KEY}"
MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}" MIX_PUSHER_APP_CLUSTER="${PUSHER_APP_CLUSTER}"
>>>>>>> 06aa931eb57dbc7c95748ade6e3bb659f0659abe
+5 -5
View File
@@ -4,7 +4,7 @@
namespace Composer\Autoload; namespace Composer\Autoload;
class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0 class ComposerStaticInitcf93d959a701f2cce72413258326eb20
{ {
public static $files = array ( public static $files = array (
'0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php',
@@ -4321,10 +4321,10 @@ class ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0
public static function getInitializer(ClassLoader $loader) public static function getInitializer(ClassLoader $loader)
{ {
return \Closure::bind(function () use ($loader) { return \Closure::bind(function () use ($loader) {
$loader->prefixLengthsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixLengthsPsr4; $loader->prefixLengthsPsr4 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixLengthsPsr4;
$loader->prefixDirsPsr4 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixDirsPsr4; $loader->prefixDirsPsr4 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixDirsPsr4;
$loader->prefixesPsr0 = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$prefixesPsr0; $loader->prefixesPsr0 = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$prefixesPsr0;
$loader->classMap = ComposerStaticInit51a2977d18ddf089cd82402f3476f1a0::$classMap; $loader->classMap = ComposerStaticInitcf93d959a701f2cce72413258326eb20::$classMap;
}, null, ClassLoader::class); }, null, ClassLoader::class);
} }