diff options
| author | Chris McDonough <chrism@plope.com> | 2011-08-23 22:45:10 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2011-08-23 22:45:10 -0400 |
| commit | b5a3b0de22d6e94185226cbb56c98e3eaa359a31 (patch) | |
| tree | 919e5c8f815ff3816adf2e3c05584a0b9ab1368b /docs/whatsnew-1.2.rst | |
| parent | 9fa4d046debe891ccdef7e96d102a34c0b209594 (diff) | |
| download | pyramid-b5a3b0de22d6e94185226cbb56c98e3eaa359a31.tar.gz pyramid-b5a3b0de22d6e94185226cbb56c98e3eaa359a31.tar.bz2 pyramid-b5a3b0de22d6e94185226cbb56c98e3eaa359a31.zip | |
add some integration tests for aconflict autoresolution
Diffstat (limited to 'docs/whatsnew-1.2.rst')
0 files changed, 0 insertions, 0 deletions