[Nitro-repository] Darcs error applying patch!

[gm@navel.gr]

We have the following extra patches:
Mon Nov  7 11:32:34 EST 2005  George Moschovitis <gm at navel.gr>
  * Removed app gen.
Will apply the following patches:
Mon Nov  7 08:24:47 EST 2005  George Moschovitis <gm at navel.gr>
  * Access the controller from context.
Mon Nov  7 08:25:42 EST 2005  George Moschovitis <gm at navel.gr>
  * Added skin template in proto.
Mon Nov  7 08:27:06 EST 2005  Bryan Soto <bryan.a.soto at gmail.com>
  * Small fix in the form generator.
diffing dir...
There are conflicts in the following files:
./gen/lib/gen/app/gen.rb


Caught exception:
user error (Refusing to apply patches leading to conflicts.
If you would rather apply the patch and mark the conflicts,
use the --mark-conflicts option to apply.)