fix conflicts.

taylorotwell · taylorotwell · commit a10e9677f475 · 2015-02-11T10:37:25.000-06:00
diff --git a/src/Illuminate/Routing/ResourceRegistrar.php b/src/Illuminate/Routing/ResourceRegistrar.php
@@ -213,6 +213,11 @@ protected function getGroupResourceName($prefix, $resource, $method)
 	{
 		$group = trim(str_replace('/', '.', $this->router->getLastGroupPrefix()), '.');
 
+		if (empty($group))
+		{
+			return trim("{$prefix}{$resource}.{$method}", '.');
+		}
+
 		return trim("{$prefix}{$group}.{$resource}.{$method}", '.');
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -213,6 +213,11 @@ protected function getGroupResourceName($prefix, $resource, $method)`
`213`	`213`	`{`
`214`	`214`	`$group = trim(str_replace('/', '.', $this->router->getLastGroupPrefix()), '.');`
`215`	`215`
	`216`	`+ if (empty($group))`
	`217`	`+ {`
	`218`	`+ return trim("{$prefix}{$resource}.{$method}", '.');`
	`219`	`+ }`
	`220`	`+`
`216`	`221`	`return trim("{$prefix}{$group}.{$resource}.{$method}", '.');`
`217`	`222`	`}`
`218`	`223`