Skip to content

S
Silex
Commit e4e0fef3 authored by Fabien Potencier's avatar Fabien Potencier
Browse files
Options

fixed wrong merge

parent 33903336
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 7 deletions
doc/usage.rst
View file @ e4e0fef3
...@@ -495,7 +495,6 @@ the defaults for new controllers. ...@@ -495,7 +495,6 @@ the defaults for new controllers.
.. note:: .. note::
The global configuration does not apply to controller providers you might The global configuration does not apply to controller providers you might
<<<<<<< HEAD
mount as they have their own global configuration (read the mount as they have their own global configuration (read the
:doc:`dedicated chapter<organizing_controllers>` for more information). :doc:`dedicated chapter<organizing_controllers>` for more information).
...@@ -503,13 +502,7 @@ the defaults for new controllers. ...@@ -503,13 +502,7 @@ the defaults for new controllers.
The converters are run for **all** registered controllers. The converters are run for **all** registered controllers.
Error handlers
=======
mount as they have their own global configuration (read the
:doc:`dedicated chapter <organizing_controllers>` for more information).
Error Handlers Error Handlers
>>>>>>> WouterJ/doc_fixes
-------------- --------------
If some part of your code throws an exception you will want to display some If some part of your code throws an exception you will want to display some
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment