diff options
author | Benjamin Peterson <benjamin@python.org> | 2015-05-02 22:34:31 -0400 |
---|---|---|
committer | Benjamin Peterson <benjamin@python.org> | 2015-05-02 22:34:31 -0400 |
commit | c9083bf1a14d9949c07804123712d2a18566fe62 (patch) | |
tree | 25323e670803d2ad720618fd6e3c256eb7fb65c1 /Python/ast.c | |
parent | 97bd4b0cd9dec026bfaa66f492f1ea3c45abb1b1 (diff) | |
download | cpython-git-c9083bf1a14d9949c07804123712d2a18566fe62.tar.gz |
remove merge markers
Diffstat (limited to 'Python/ast.c')
0 files changed, 0 insertions, 0 deletions