Review: Resubmit
Please fix the conflicts:
$ bzr merge lp:~ubuntukylin-members/ubiquity-slideshow-ubuntu/ubuntukylin-1604
+N slideshows/ubuntukylin/slides/screenshots/ukunity.jpg
+N slideshows/ubuntukylin/slides/screenshots/weixin.jpg
+N slideshows/ubuntukylin/slides/ukunity.html
+N slideshows/ubuntukylin/slides/weixin.html
M po/ubuntukylin/slideshow-ubuntukylin.pot
M po/ubuntukylin/zh_CN.po
M po/ubuntukylin/zh_HK.po
M po/ubuntukylin/zh_TW.po
-D slideshows/ubuntukylin/slides/icons/fastdisk.png
M slideshows/ubuntukylin/slides/index.html
-D slideshows/ubuntukylin/slides/kuaipan.html
M slideshows/ubuntukylin/slides/screenshots/community.jpg
-D slideshows/ubuntukylin/slides/screenshots/kuaipan.jpg
M slideshows/ubuntukylin/slides/screenshots/software-center.jpg
M slideshows/ubuntukylin/slides/screenshots/sogou.jpg
M slideshows/ubuntukylin/slides/screenshots/theme.jpg
M slideshows/ubuntukylin/slides/screenshots/welcome.jpg
M slideshows/ubuntukylin/slides/screenshots/wps.jpg
M slideshows/ubuntukylin/slides/screenshots/youker-series.jpg
M slideshows/ubuntukylin/slides/screenshots/youker.jpg
M slideshows/ubuntukylin/slides/theme.html
Text conflict in po/ubuntukylin/zh_CN.po
Text conflict in po/ubuntukylin/zh_HK.po
Text conflict in po/ubuntukylin/zh_TW.po
3 conflicts encountered.
--
https://code.launchpad.net/~ubuntukylin-members/ubiquity-slideshow-ubuntu/ubuntukylin-1604/+merge/291474
Your team Ubuntu Kylin Members is subscribed to branch
lp:~ubuntukylin-members/ubiquity-slideshow-ubuntu/ubuntukylin-1604.
--
Mailing list: https://launchpad.net/~ubuntukylin-members
Post to : [email protected]
Unsubscribe : https://launchpad.net/~ubuntukylin-members
More help : https://help.launchpad.net/ListHelp
