diff options
author | Benjamin Peterson <benjamin@python.org> | 2009-05-02 20:14:55 +0000 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2009-05-02 20:14:55 +0000 |
commit | 65b42a1e8fe2edc03ccec0e37bc8a06cdd593675 (patch) | |
tree | 1a0a90493cc544ff5cb6e6b99faf83643f050d0c /Python/marshal.c | |
parent | aef3fb082ce3fec607ac2ba0afe71db1195a7ba7 (diff) | |
download | cpython-git-65b42a1e8fe2edc03ccec0e37bc8a06cdd593675.tar.gz |
revert merge properties to something sane
Diffstat (limited to 'Python/marshal.c')
0 files changed, 0 insertions, 0 deletions