You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
13 lines
405 B
13 lines
405 B
<<<<<<< HEAD
|
|
eclipse.preferences.version=1
|
|
encoding//src/main/java=UTF-8
|
|
encoding//src/main/resources=UTF-8
|
|
encoding//src/test/java=UTF-8
|
|
encoding/<project>=UTF-8
|
|
=======
|
|
eclipse.preferences.version=1
|
|
encoding//src/main/java=UTF-8
|
|
encoding//src/main/resources=UTF-8
|
|
encoding//src/test/java=UTF-8
|
|
encoding/<project>=UTF-8
|
|
>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
|