[FrameworkBundle] fixed merge problem

schmittjoh · Mar 21, 2011 · 82a5ae6 · 82a5ae6
1 parent 5a528bc
commit 82a5ae6
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Symfony/Component/HttpKernel/Kernel.php b/src/Symfony/Component/HttpKernel/Kernel.php
@@ -414,7 +414,7 @@ protected function initializeBundles()
      *
      * @return string The container class
      */
-    protected function getContainerClass()
+    public function getContainerClass()
     {
         return $this->name.ucfirst($this->environment).($this->debug ? 'Debug' : '').'ProjectContainer'.($this->cacheDir ? 'Tmp' : '');
     }