[Opendnssec-develop] Merge OpenDNSSEC-pin2 into trunk

Rickard Bellgrim rickard at opendnssec.org
Mon Aug 27 15:04:21 UTC 2012

Previous message (by thread): [Opendnssec-develop] Adapter tests up and running on trunk
Next message (by thread): [Opendnssec-develop] Merge OpenDNSSEC-pin2 into trunk
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi

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?

// Rickard

Previous message (by thread): [Opendnssec-develop] Adapter tests up and running on trunk
Next message (by thread): [Opendnssec-develop] Merge OpenDNSSEC-pin2 into trunk
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the Opendnssec-develop mailing list