-
# Conflicts: # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
# Conflicts: # src/main/java/com/cnlive/mz/live/action/LiveAction.java # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
# Conflicts: # .settings/org.eclipse.wst.common.component # target/m2e-wtp/web-resources/META-INF/MANIFEST.MF # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
http://bj.gitlab.cnlive.com/liujicheng/cnlive_live_web into v532 # Conflicts: # target/m2e-wtp/web-resources/META-INF/maven/com.cnlive.mz.live.web/cnlive_live_web/pom.properties
-
# Conflicts: # src/main/java/com/cnlive/mz/live/rest/BaseUtil.java