diff options
| author | Georg Brandl <georg@python.org> | 2010-11-26 08:58:14 (GMT) |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2010-11-26 08:58:14 (GMT) |
| commit | 241efded1d1d66e326b134a871a10e076914b3a2 (patch) | |
| tree | 4f212d774fce13026765d24d0d3b98cebd2319cd /Objects/obmalloc.c | |
| parent | 3fd9ef8f65820d155282d286408479228aa207b0 (diff) | |
| download | cpython-241efded1d1d66e326b134a871a10e076914b3a2.zip cpython-241efded1d1d66e326b134a871a10e076914b3a2.tar.gz cpython-241efded1d1d66e326b134a871a10e076914b3a2.tar.bz2 | |
Fix mismerges of version directives.
Diffstat (limited to 'Objects/obmalloc.c')
0 files changed, 0 insertions, 0 deletions