diff options
| author | Christian Heimes <christian@cheimes.de> | 2013-10-22 08:45:31 (GMT) |
|---|---|---|
| committer | Christian Heimes <christian@cheimes.de> | 2013-10-22 08:45:31 (GMT) |
| commit | d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7 (patch) | |
| tree | 4700b5fe115d79123b6490bba8f5a56cd8380165 /Lib/test/test_resource.py | |
| parent | efa48676d52c8b45eaf832c3cdccad5597a30884 (diff) | |
| download | cpython-d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7.zip cpython-d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7.tar.gz cpython-d1d7576fb4a6787e3ebc0b5060561c076c9a4bf7.tar.bz2 | |
Fix Misc/NEWS merge conflict, hurray
Diffstat (limited to 'Lib/test/test_resource.py')
0 files changed, 0 insertions, 0 deletions