merged conflict

Author: fabpot

book/page_creation.rst

@@ -204,6 +204,7 @@ of writing the HTML inside the controller, use a template instead::
  // src/Sensio/HelloBundle/Controller/HelloController.php
 
  namespace Sensio\HelloBundle\Controller;
+
  use Symfony\Bundle\FrameworkBundle\Controller\Controller;
 
  class HelloController extends Controller
@@ -215,7 +216,6 @@ of writing the HTML inside the controller, use a template instead::
  // render a PHP template instead
  // return $this->render('HelloBundle:Hello:index.html.php', array('name' => $name));
  }
- 
  }
 
 .. note::