fixing merge issues

2012-07-27 13:52:15 +01:00
parent da35e257fd b325e954e3
commit 2c6ed23b45
48 changed files with 101 additions and 101 deletions
--- a/laravel/helpers.php
+++ b/laravel/helpers.php
@@ -462,7 +462,7 @@ function root_namespace($class, $separator = '\\')
 /**
 * Get the "class basename" of a class or object.
 *
- * The basename is considered the name of the class minus all namespaces.
+ * The basename is considered to be the name of the class minus all namespaces.
 *
 * @param  object|string  $class
 * @return string