diff options
| author | Steve Piercy <web@stevepiercy.com> | 2015-11-12 01:04:18 -0800 |
|---|---|---|
| committer | Steve Piercy <web@stevepiercy.com> | 2015-11-12 01:04:18 -0800 |
| commit | 1b994c6b87449a9542dcf5f0daf44023dbff31ff (patch) | |
| tree | 4b1e927e4328d278e8412513b9e7158838d0e9e1 /docs/tutorials/wiki2 | |
| parent | 16a490fa4c44776d9a22b8a7ddc19a23702cb7ee (diff) | |
| download | pyramid-1b994c6b87449a9542dcf5f0daf44023dbff31ff.tar.gz pyramid-1b994c6b87449a9542dcf5f0daf44023dbff31ff.tar.bz2 pyramid-1b994c6b87449a9542dcf5f0daf44023dbff31ff.zip | |
basiclayout/tutorial poke in attempt to resolve merge conflict on GitHub
Diffstat (limited to 'docs/tutorials/wiki2')
| -rw-r--r-- | docs/tutorials/wiki2/basiclayout.rst | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/docs/tutorials/wiki2/basiclayout.rst b/docs/tutorials/wiki2/basiclayout.rst index 5d9b62eea..c293f3170 100644 --- a/docs/tutorials/wiki2/basiclayout.rst +++ b/docs/tutorials/wiki2/basiclayout.rst @@ -162,6 +162,7 @@ database and provide an alternate error response. That response will include the text shown at the end of the file, which will be displayed in the browser to inform the user about possible actions to take to solve the problem. + Content models with the ``models`` package ------------------------------------------ |