fix conflicts

laravel · Sep 7, 2016 · 64a34f8 · 64a34f8
2 parents 0aa7f34 + 99499d3
commit 64a34f8
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Illuminate/Database/Connectors/Connector.php b/src/Illuminate/Database/Connectors/Connector.php
@@ -85,7 +85,7 @@ public function setDefaultOptions(array $options)
     }
 
     /**
-     * Handle a exception that occurred during connect execution.
+     * Handle an exception that occurred during connect execution.
      *
      * @param  \Exception  $e
      * @param  string  $dsn