Viewing all changes in revision 1569.2.1.
- Committer: Gary.Wzl
- Date: 2017-10-16 03:17:22 UTC
- mfrom: (1567.1.1 livecd-rootfs)
- mto: (1575.1.1 livecd-rootfs)
- mto: This revision was merged to the branch mainline in revision 1576.
- Revision ID: gary.wang@canonical.com-20171016031722-9em1a4ca1r4aisqx
Resolve the conflict.
- files modified:
- debian/changelog
expand all
collapse all
added
removed
