diff options
| author | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 07:06:49 -0700 |
|---|---|---|
| committer | Senthil Kumaran <senthil@uthcode.com> | 2013-09-12 07:06:49 -0700 |
| commit | f5ce0122ce210210456bae496f792d018c17b2be (patch) | |
| tree | b4a13af2416a323b705579f97f9893dbd43fb5b9 /Lib/test/test_httpservers.py | |
| parent | b5651edaf12d0e3320c2a73ed9a6c4aaec7557d8 (diff) | |
| download | cpython-git-f5ce0122ce210210456bae496f792d018c17b2be.tar.gz | |
Removing the merge conflict markers.
- my previous removal and hg resolve mark had still left them and hooks did not catch it too!
Diffstat (limited to 'Lib/test/test_httpservers.py')
0 files changed, 0 insertions, 0 deletions