fix conflicts

2016-07-09 11:28:21 -05:00
parent c0898cc71a 02274da8fd
commit d72e3f3af5
8 changed files with 12 additions and 7 deletions
--- a/config/cache.php
+++ b/config/cache.php
@@ -11,6 +11,8 @@ return [
    | using this caching library. This connection is used when another is
    | not explicitly specified when executing a given caching function.
    |
+    | Supported: "apc", "array", "database", "file", "memcached", "redis"
+    |
    */

    'default' => env('CACHE_DRIVER', 'file'),