[innotop/epel7: 28/29] Fix merge conflict

Fabio Alessandro Locati fale at fedoraproject.org
Sat Aug 23 07:17:00 UTC 2014

Previous message: [innotop/epel7: 27/29] Merge branch 'f20'
Next message: [innotop/epel7: 29/29] Use standard way to represent dependencies on Perl packages. This could help to prevent problems in
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

commit ea3ce3d0c8d15efb23cf332de54b94daaa8c9d4f
Merge: af037b1 0cb842d
Author: Fabio Alessandro Locati <fabiolocati at gmail.com>
Date:   Thu Aug 21 11:52:22 2014 +0200

    Fix merge conflict

---

Previous message: [innotop/epel7: 27/29] Merge branch 'f20'
Next message: [innotop/epel7: 29/29] Use standard way to represent dependencies on Perl packages. This could help to prevent problems in
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

More information about the scm-commits mailing list