=\=\=\=\=\=\=
<<<<<<<=HEAD
>>>>>>>=branch 'master' of http\://82.156.111.58\:3000/maojian/appliction_manager.git
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding/<project>=UTF-8