diff options
| author | Karl O. Pinc <kop@meme.com> | 2018-11-18 23:16:20 -0600 |
|---|---|---|
| committer | Karl O. Pinc <kop@meme.com> | 2018-11-18 23:48:49 -0600 |
| commit | 084cdc68d27299a3aaf6f9a2464dd5b99fbb9947 (patch) | |
| tree | aa3b220b53c1569434a91cbc7e36ff6bb26d01e8 /docs/glossary.rst | |
| parent | 3f01e1f615041aa0e6787e1c6ba2f9c54d139100 (diff) | |
| download | pyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.tar.gz pyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.tar.bz2 pyramid-084cdc68d27299a3aaf6f9a2464dd5b99fbb9947.zip | |
Note what directive takes effect when conflits are resolved with commit()
Diffstat (limited to 'docs/glossary.rst')
0 files changed, 0 insertions, 0 deletions