Mercurial > ift6266
diff writeup/nips10submit_e.sty @ 533:22d5cd82d5f0
resolved conflit
author | Yoshua Bengio <bengioy@iro.umontreal.ca> |
---|---|
date | Tue, 01 Jun 2010 21:24:39 -0400 |
parents | a48601e8d431 |
children | 51213beaed8b |
author | Yoshua Bengio <bengioy@iro.umontreal.ca> |
---|---|
date | Tue, 01 Jun 2010 21:24:39 -0400 |
parents | a48601e8d431 |
children | 51213beaed8b |