# Conflicts:
# deploy/pom.xml
# deploy/src/main/META-INF/autoconf/auto-config.xml
# deploy/src/main/META-INF/autoconf/bin/env.bat
# deploy/src/main/META-INF/autoconf/bin/env.sh
# deploy/src/main/META-INF/autoconf/conf/jboss/application.xml
# deploy/src/main/META-INF/autoconf/conf/tomcat/server.xml
# deploy/src/main/application.xml
# deploy/src/main/assembly/assembly.xml
# deploy/src/main/bin/env.bat
# deploy/src/main/bin/env.sh
# deploy/src/main/bin/jbossctl-dev.bat
# deploy/src/main/bin/tomcat-dev.bat
# deploy/src/main/conf/tomcat/server.xml
# pom.xml
# service/pom.xml
# service/src/main/java/com/yoho/search/restapi/BrandController.java
# service/src/main/java/com/yoho/search/restapi/SearchController.java
# service/src/main/java/com/yoho/search/restapi/TblProductController.java
# service/src/main/java/com/yoho/search/service/BrandSearchService.java
# service/src/main/java/com/yoho/search/service/SearchService.java
# service/src/main/java/com/yoho/search/service/SearchSortSizeService.java
# service/src/main/java/com/yoho/search/service/TblProductService.java
# web/pom.xml
# web/src/main/resources/META-INF/spring/spring-web-context.xml
# web/src/main/resources/config.properties
# web/src/main/resources/configuration.xml
# web/src/main/resources/databases.yml
# web/src/main/resources/logback.xml
# web/src/main/webapp/META-INF/autoconf/auto-config.xml
# web/src/main/webapp/META-INF/autoconf/config.properties
# web/src/main/webapp/META-INF/autoconf/databases.yml
# web/src/main/webapp/META-INF/autoconf/logback.xml
# web/src/main/webapp/WEB-INF/web.xml
# web/src/main/webapp/index.jsp
