diff options
| author | Chris McDonough <chrism@plope.com> | 2011-07-24 01:39:54 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-07-24 01:39:54 -0400 |
| commit | 47525f0359bee8db346f5dbf774e4974c69fd2a9 (patch) | |
| tree | 498b17355085eea61f72f9ba4e1e723cb17ddd39 /docs | |
| parent | 6434998267a4930fd9175df06b9a07d83937b71d (diff) | |
| parent | dc45abfdfe1ec247ce199dcedeb178146a749023 (diff) | |
| download | pyramid-47525f0359bee8db346f5dbf774e4974c69fd2a9.tar.gz pyramid-47525f0359bee8db346f5dbf774e4974c69fd2a9.tar.bz2 pyramid-47525f0359bee8db346f5dbf774e4974c69fd2a9.zip | |
fix merge conflicts
Diffstat (limited to 'docs')
| -rw-r--r-- | docs/api/config.rst | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/api/config.rst b/docs/api/config.rst index 96e955388..21e2b828d 100644 --- a/docs/api/config.rst +++ b/docs/api/config.rst @@ -78,6 +78,8 @@ .. automethod:: set_view_mapper + .. automethod:: add_request_handler + .. automethod:: testing_securitypolicy .. automethod:: testing_resources |