# Conflicts: # ABVJE_BL/src/jp/agentec/abook/abv/bl/acms/type/ServiceOption.java # ABVJE_BL/src/jp/agentec/abook/abv/bl/data/ABVDataCache.java