diff setup.py @ 3145:9aa9436a81e0

better edit conflict handling
author Richard Jones <richard@users.sourceforge.net>
date Sun, 13 Feb 2005 22:04:32 +0000
parents 0a81ed2b397d
children 30f08255e4c0
line wrap: on
line diff

Roundup Issue Tracker: http://roundup-tracker.org/