summaryrefslogtreecommitdiff
path: root/docs/designdefense.rst
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2013-11-18 07:03:51 -0500
committerChris McDonough <chrism@plope.com>2013-11-18 07:03:51 -0500
commitc503891d43251e7bf6111c6c1f521b43c55d917b (patch)
tree3028630a1d1e331718e16be26a54d69c56d76b9d /docs/designdefense.rst
parent345694c8eb6dff9ef7375374c5032e53b764c1de (diff)
parentfb15c26a2960d5f7bf598c147f1dd6ad6a062952 (diff)
downloadpyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.gz
pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.tar.bz2
pyramid-c503891d43251e7bf6111c6c1f521b43c55d917b.zip
Merge branch 'master' into 1.5-branch
Diffstat (limited to 'docs/designdefense.rst')
-rw-r--r--docs/designdefense.rst2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/designdefense.rst b/docs/designdefense.rst
index bbce3e29c..2f3c14881 100644
--- a/docs/designdefense.rst
+++ b/docs/designdefense.rst
@@ -1078,7 +1078,7 @@ The contents of ``app2.py``:
The contents of ``config.py``:
.. code-block:: python
- :linenos:
+ :linenos:
L = []