[python-yolk/f15: 4/4] fix merge conflict

saispo saispo at fedoraproject.org
Fri Jul 1 14:11:09 UTC 2011

Previous message: [pkgdb] rubygem-compass-960-plugin (Fedora, devel) updated by limb
Next message: [dhcp] Created tag dhcp-4.2.2-0.1.b1.fc16
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit ca9e66207dc6c565b24c7c559947066216ed3819
Merge: a22d2e2 3df90f0
Author: Jerome Soyer <jerome.soyer at ac-dijon.fr>
Date:   Fri Jul 1 16:10:02 2011 +0200

    fix merge conflict

---

Previous message: [pkgdb] rubygem-compass-960-plugin (Fedora, devel) updated by limb
Next message: [dhcp] Created tag dhcp-4.2.2-0.1.b1.fc16
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list