ubuntukylin-members team mailing list archive

[Steve Langasek <steve.langasek@xxxxxxxxxxxxx>]

Steve Langasek has proposed merging lp:~vorlon/ubuntukylin-default-settings/1.0.1 into lp:ubuntukylin-default-settings.

Requested reviews:
  UbuntuKylin Members (ubuntukylin-members)

For more details, see:
https://code.launchpad.net/~vorlon/ubuntukylin-default-settings/1.0.1/+merge/146246

Fix a merge conflict that wasn't resolved before commit; this makes the
package that was uploaded to Ubuntu broken, unbuildable.  Even if you prefer
to make a different change to resolve this merge conflict, please merge this
change first as this matches the version that I have re-uploaded to raring,
so should be recorded in the history.
-- 
https://code.launchpad.net/~vorlon/ubuntukylin-default-settings/1.0.1/+merge/146246
Your team UbuntuKylin Members is requested to review the proposed merge of lp:~vorlon/ubuntukylin-default-settings/1.0.1 into lp:ubuntukylin-default-settings.

=== modified file 'depends.txt'
--- depends.txt	2013-02-01 09:48:40 +0000
+++ depends.txt	2013-02-01 23:48:18 +0000
@@ -26,13 +26,9 @@
 firefox-locale-zh-hans
 thunderbird-locale-zh-hans
 thunderbird-locale-zh-cn
-<<<<<<< TREE
-#ibus-googlepinyin
-=======
 libreoffice-help-zh-cn
 libreoffice-l10n-zh-cn
 ibus-googlepinyin
->>>>>>> MERGE-SOURCE
 ibus-table-wubi
 ttf-wqy-zenhei
 ttf-arphic-ukai
@@ -42,7 +38,4 @@
 #smplayer
 ubuntukylin-theme
 chinese-calendar
-<<<<<<< TREE
-=======
 gnome-tweak-tool 
->>>>>>> MERGE-SOURCE