Merge branch '2.1' into 2.2

orchestral · Jun 15, 2014 · 67925b5 · 67925b5
2 parents 399d1cb + f781bf4
commit 67925b5
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/tests/Theme/ContainerTest.php b/tests/Theme/ContainerTest.php
@@ -1,4 +1,4 @@
-<?php namespace Orchestra\View\Tests\Theme;
+<?php namespace Orchestra\View\TestCase\Theme;
 
 use Mockery as m;
 use Orchestra\View\Theme\Container;

diff --git a/tests/Theme/FinderTest.php b/tests/Theme/FinderTest.php
@@ -1,4 +1,4 @@
-<?php namespace Orchestra\View\Tests\Theme;
+<?php namespace Orchestra\View\TestCase\Theme;
 
 use Mockery as m;
 use Orchestra\View\Theme\Finder;

diff --git a/tests/Theme/ManifestTest.php b/tests/Theme/ManifestTest.php
@@ -1,4 +1,4 @@
-<?php namespace Orchestra\View\Tests\Theme;
+<?php namespace Orchestra\View\TestCase\Theme;
 
 use Mockery as m;
 use Orchestra\View\Theme\Manifest;

diff --git a/tests/Theme/ThemeManagerTest.php b/tests/Theme/ThemeManagerTest.php
@@ -1,4 +1,4 @@
-<?php namespace Orchestra\View\Tests\Theme;
+<?php namespace Orchestra\View\TestCase\Theme;
 
 use Mockery as m;
 use Orchestra\View\Theme\ThemeManager;