[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merge conflict between gtk3 and master

From: Ben Pfaff
Subject: Re: Merge conflict between gtk3 and master
Date: Sun, 8 Sep 2013 17:29:24 -0700
User-agent: Mutt/1.5.21 (2010-09-15)

On Sun, Sep 08, 2013 at 04:23:10AM +0200, John Darrington wrote:
> There is a conflict when trying to merge master and gtk3 branches,
> which I'm not sure how to resolve.

I'll try to take a look tonight.

I guess that I should make another try at resolving some issues in this
branch anyway.  I ran into some trouble and got discouraged, but I need
to try again.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]