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.
11 lines
277 B
11 lines
277 B
<<<<<<< HEAD
|
|
activeProfiles=
|
|
eclipse.preferences.version=1
|
|
resolveWorkspaceProjects=true
|
|
version=1
|
|
=======
|
|
activeProfiles=
|
|
eclipse.preferences.version=1
|
|
resolveWorkspaceProjects=true
|
|
version=1
|
|
>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git
|