# Conflicts:
#   o2server/x_cms_assemble_control/src/main/java/com/x/cms/assemble/control/service/CmsBatchOperationPersistService.java
#   o2web/gulpfile.js
#   o2web/source/o2_core/o2.js
#   o2web/source/o2_core/o2/xDesktop/Common.js