Merge pull request #161 from kubre/patch-1

Fixed git merge conflict

Author: MikeAlhayek

templates/default/controller-upload-method-5.3.stub

@@ -12,12 +12,8 @@
             return '';
         }
 
-<<<<<<< HEAD
-        $path = config('codegenerator.files_upload_path', 'uploads');
-=======
         $path = config('laravel-code-generator.files_upload_path', 'uploads');
->>>>>>> v2.3
         $saved = $file->store('public/' . $path, config('filesystems.default'));
 
         return substr($saved, 7);
-    }
+    }