Merge branch 'hotfix/34'

Close #34
phly · Feb 17, 2015 · dd76e39 · dd76e39
2 parents 181ef02 + d85519d
commit dd76e39
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -25,7 +25,8 @@ signature changes in `Phly\Conduit\Http\Request`.
 
 ### Fixed
 
-- Nothing.
+- [#34](https://github.com/phly/conduit/pull/34) Remove unused variable from
+ test bootstrap.
 
 ## 0.13.0 - 2015-01-28
 

diff --git a/test/Bootstrap.php b/test/Bootstrap.php
@@ -11,8 +11,6 @@
  */
 class Bootstrap
 {
- protected static $serviceManager;
-
  public static function init()
  {
  static::initAutoloader();