Re: [naviserver-devel] driver changes, please check

[Gustaf N. <ne...@wu...>]

Am 12.04.10 15:10, schrieb Stephen Deasey:
> You are going to have to merge the two heads with 'hg merge' and then
> push that changeset. See: hg help merge.
>    
many thanks! should be fine now.
-gustaf