ubuntukylin-members team mailing list archive

[Joey Zheng <joey.zheng@xxxxxxxxxxxxx>]

Joey Zheng has proposed merging lp:~jzheng/ubuntu-kylin-software-center/trunk into lp:ubuntu-kylin-software-center.

Requested reviews:
  Shine Huang (shine)

For more details, see:
https://code.launchpad.net/~jzheng/ubuntu-kylin-software-center/trunk/+merge/210050

 - fix conflicts
-- 
https://code.launchpad.net/~jzheng/ubuntu-kylin-software-center/trunk/+merge/210050
Your team Ubuntu Kylin Members is subscribed to branch lp:ubuntu-kylin-software-center.

=== modified file 'softwarecenter.py'
--- softwarecenter.py	2014-03-08 09:48:11 +0000
+++ softwarecenter.py	2014-03-08 11:09:16 +0000
@@ -884,7 +884,6 @@
 
 
 if __name__ == '__main__':
-<<<<<<< TREE
 
     print "sadfaf"
     print UBUNTUKYLIN_RES_PATH
@@ -893,6 +892,3 @@
 
     print "dsafd"
     main()
-=======
-    main()
->>>>>>> MERGE-SOURCE