[LinuxPPS] Git conflicts

[Philip M. White]

On Mon, Jul 30, 2007 at 05:27:41PM +0200, Rodolfo Giometti wrote:
> Mmm... quite strange... did you modify your tree?

I did not modify my tree, but I can no longer reproduce this.  I spent a
couple of hours learning Git, and now I can merge the LinuxPPS
repository with the vanilla kernel without any errors.  Sorry for the
trouble. :)

-- 
Philip
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://ml.enneenne.com/pipermail/linuxpps/attachments/20070805/eeab6565/attachment.pgp