conflict fix

all conflict fixed
2016-08-03 21:19:11 +05:30
parent ffa56a43cb e90c764c88
commit 18af857291
9 changed files with 23 additions and 219 deletions
--- a/app/Http/Controllers/Api/v1/InstallerApiController.php
+++ b/app/Http/Controllers/Api/v1/InstallerApiController.php
@@ -98,7 +98,7 @@ class InstallerApiController extends Controller
                $ENV['QUEUE_DRIVER'] = 'sync';

                $config = '';
-                
+
                foreach ($ENV as $key => $val) {
                    $config .= "{$key}={$val}\n";
                }