diff options
| author | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2015-02-17 19:37:52 -0500 |
| commit | d4333972ad328f06262ba55ef2a3d24963da95b0 (patch) | |
| tree | c208aafc07a03934307019120910c3a576982978 /HACKING.txt | |
| parent | b63f0c5f6e2f322bd9183d194b4aa774f9f4e93f (diff) | |
| parent | 4dacb8c24efe98cb14b3ef89f6c9a8b2fd196790 (diff) | |
| download | pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.gz pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.tar.bz2 pyramid-d4333972ad328f06262ba55ef2a3d24963da95b0.zip | |
fix merge conflicts
Diffstat (limited to 'HACKING.txt')
| -rw-r--r-- | HACKING.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/HACKING.txt b/HACKING.txt index 16c17699c..e104869ec 100644 --- a/HACKING.txt +++ b/HACKING.txt @@ -195,7 +195,7 @@ Test Coverage ------------- - The codebase *must* have 100% test statement coverage after each commit. - You can test coverage via ``tox -e coverage``, or alternately by installing + You can test coverage via ``tox -e cover``, or alternately by installing ``nose`` and ``coverage`` into your virtualenv (easiest via ``setup.py dev``) , and running ``setup.py nosetests --with-coverage``. |