[Opendnssec-develop] Merge OpenDNSSEC-pin2 into trunk

[Jerry Lundström]

On Mon, Aug 27, 2012 at 5:04 PM, Rickard Bellgrim
<rickard at opendnssec.org> wrote:
> I have tried to merge the PIN handling back into trunk, but there are
> some conflicts. Wondering if anyone have any good SVN tricks to
> resolve this?

There are not tricks when there are conflicts, you need run through
the conflicts and fix them one by one.

/Jerry

-- 
Jerry Lundström - OpenDNSSEC Developer
http://www.opendnssec.org/