diff options
| author | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
|---|---|---|
| committer | Casey Duncan <casey.duncan@gmail.com> | 2010-12-12 09:40:19 -0700 |
| commit | 226c469217cbddc3443da2a60dc414b82021bcbe (patch) | |
| tree | c049b1c25b4b70a43f2b99f8515fd3d628cbffd2 /docs/zcml/static.rst | |
| parent | 87a6ffdb91ae9f983169c3e9da15ea0266745a74 (diff) | |
| parent | fee38663daccc0130d0c34dbc5a14e67bef2e183 (diff) | |
| download | pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.gz pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.tar.bz2 pyramid-226c469217cbddc3443da2a60dc414b82021bcbe.zip | |
fix merge conflicts
Diffstat (limited to 'docs/zcml/static.rst')
| -rw-r--r-- | docs/zcml/static.rst | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/zcml/static.rst b/docs/zcml/static.rst index 164e7400c..9538d18f0 100644 --- a/docs/zcml/static.rst +++ b/docs/zcml/static.rst @@ -79,7 +79,7 @@ Examples Alternatives ~~~~~~~~~~~~ -:meth:`pyramid.configuration.configurator.add_static_view` can also +:meth:`pyramid.config.Configurator.add_static_view` can also be used to add a static view. See Also |