[templates_parser/f20: 5/7] resolve merge conflict

Julian Leyh oenone at fedoraproject.org
Wed May 7 17:21:36 UTC 2014

Previous message: [templates_parser/f20: 4/7] update changelog
Next message: [templates_parser/f20: 6/7] remove unnecessary patches for 11.8.0
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit 415471d9e434a962e5830e56dee5cad2ff9b0391
Merge: 4a5b1dc 8a1d27b
Author: Julian Leyh <julian at vgai.de>
Date:   Sat Apr 19 00:02:49 2014 +0200

    resolve merge conflict

---

Previous message: [templates_parser/f20: 4/7] update changelog
Next message: [templates_parser/f20: 6/7] remove unnecessary patches for 11.8.0
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list