comparison data_generation/transformations/pycaptcha/setup.py @ 533:22d5cd82d5f0

resolved conflit
author Yoshua Bengio <bengioy@iro.umontreal.ca>
date Tue, 01 Jun 2010 21:24:39 -0400
parents 1f5937e9e530
children
comparison
equal deleted inserted replaced
532:2e33885730cf 533:22d5cd82d5f0