> Jul 18, 2011 03:32:08 PM, [email protected] wrote:
> Howdy,
> What happened that required all this?
Duke: This was (bad) side effect of the problem last night where you and I
were each fixing the same point in the same file. I got a merge-conflict there
last night. I thought I had it all cleaned up at that time. Turns out I had
not. So things got further muddled today; one thing led to another ...
To clear things up on my end, I blew away my local repository and did a fresh
clone from git.
Sorry for the inconvenience.
Thank you very much.
kid51
_______________________________________________
http://lists.parrot.org/mailman/listinfo/parrot-dev
