diff options
| author | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2013-09-08 04:44:50 -0400 |
| commit | 6a28ee15243fa1a3ae918d176cc6629c1cacfb7e (patch) | |
| tree | 98576c6ad37cf7c6c0cfaf62b635723380cc2393 /docs/tutorials/wiki2/tests.rst | |
| parent | fc477b2e4b20ae2788e468e45b2831e774be8ced (diff) | |
| parent | bd5a7ff20d9bdeaf36ef4154cbb0322696a46e2b (diff) | |
| download | pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.gz pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.tar.bz2 pyramid-6a28ee15243fa1a3ae918d176cc6629c1cacfb7e.zip | |
fix merge conflict
Diffstat (limited to 'docs/tutorials/wiki2/tests.rst')
| -rw-r--r-- | docs/tutorials/wiki2/tests.rst | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/tutorials/wiki2/tests.rst b/docs/tutorials/wiki2/tests.rst index 33b5d35c1..9aca0c5b7 100644 --- a/docs/tutorials/wiki2/tests.rst +++ b/docs/tutorials/wiki2/tests.rst @@ -54,8 +54,8 @@ Change the ``requires`` list in ``setup.py`` to include ``WebTest``. .. literalinclude:: src/tests/setup.py :linenos: :language: python - :lines: 11-21 - :emphasize-lines: 10 + :lines: 11-22 + :emphasize-lines: 11 After we've added a dependency on WebTest in ``setup.py``, we need to rerun ``setup.py develop`` to get WebTest installed into our virtualenv. Assuming |