Mercurial > ift6266
diff datasets/ftfile.py @ 533:22d5cd82d5f0
resolved conflit
author | Yoshua Bengio <bengioy@iro.umontreal.ca> |
---|---|
date | Tue, 01 Jun 2010 21:24:39 -0400 |
parents | a92ec9939e4f |
children | 5e481b224117 |
author | Yoshua Bengio <bengioy@iro.umontreal.ca> |
---|---|
date | Tue, 01 Jun 2010 21:24:39 -0400 |
parents | a92ec9939e4f |
children | 5e481b224117 |