GSoC is over

[Jorge Villaseñor]

On Mon, Oct 19, 2015 at 1:00 PM, Koosha Khajehmoogahi <
koosha.khajeh at gmail.com> wrote:

> I *think* I did it but the head apparently has changed. Sorry, I don't
> have professional experience with Mercurial; I'm a git guy. Please let
> me know if there is anything that needs to be changed/reverted.
>
>
Hi Koosha, maybe you didn't pushed to your repository after the merge.
I tried to pull your changes, merge the main default branch with your
changes but it doesn't merge cleanly.

Can you try again so we can review it easily? If you can't we can try it
ourself but it makes more sense for you to merge the changes since you know
better what is going on in there

-- 
Masca

A: Because it messes up the order in which people normally read text.
Q: Why is top-posting such a bad thing?
A: Top-posting.
Q: What is the most annoying thing on usenet and in e-mail?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://pidgin.im/pipermail/devel/attachments/20151019/238d4ab6/attachment.html>