[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Merge conflict between gtk3 and master
|
From: |
John Darrington |
|
Subject: |
Merge conflict between gtk3 and master |
|
Date: |
Sun, 8 Sep 2013 04:23:10 +0200 |
|
User-agent: |
Mutt/1.5.21 (2010-09-15) |
There is a conflict when trying to merge master and gtk3 branches, which I'm
not sure
how to resolve.
I think we should not leave such conflicts too long - the longer they are left,
the harder
they get to resolve.
J'
--
PGP Public key ID: 1024D/2DE827B3
fingerprint = 8797 A26D 0854 2EAB 0285 A290 8A67 719C 2DE8 27B3
See http://keys.gnupg.net or any PGP keyserver for public key.
signature.asc
Description: Digital signature
- Merge conflict between gtk3 and master,
John Darrington <=