From gm at navel.gr  Mon Jun 26 12:42:12 2006
From: gm at navel.gr (gm at navel.gr)
Date: Mon, 26 Jun 2006 12:42:12 -0400 (EDT)
Subject: [Nitro-repository] Darcs error applying patch!
Message-ID: <20060626164212.E0519A6C068@virgo.neusis.com>

We have the following extra patches:
Will apply the following patches:
Mon Jun 26 12:37:05 EDT 2006  George Moschovitis <gm at navel.gr>
  * Changes to make compatible with 1.4.2
diffing dir...
There are conflicts in the following files:
./nitro/lib/nitro/cgi/request.rb ./nitro/lib/nitro/helper.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.)

From gm at navel.gr  Thu Jun 29 12:07:11 2006
From: gm at navel.gr (gm at navel.gr)
Date: Thu, 29 Jun 2006 12:07:11 -0400 (EDT)
Subject: [Nitro-repository] Patch applied
Message-ID: <20060629160711.64817A6C0F4@virgo.neusis.com>

We have the following extra patches:
Will apply the following patches:
Thu Jun 29 11:15:20 EDT 2006  George Moschovitis <gm at navel.gr>
  * Removed paramix-fix, not needed in facets 1.4.3
Thu Jun 29 11:15:58 EDT 2006  George Moschovitis <gm at navel.gr>
  * Fixed add_rule in dispatcher [james_b]
diffing dir...
Applying patches to the local directories...
diffing dir...
Finished applying...