|
|
|
@ -1,28 +1,3 @@ |
|
|
|
<<<<<<< HEAD |
|
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
|
<projectDescription> |
|
|
|
<name>bigmodel</name> |
|
|
|
<comment></comment> |
|
|
|
<projects> |
|
|
|
</projects> |
|
|
|
<buildSpec> |
|
|
|
<buildCommand> |
|
|
|
<name>org.eclipse.jdt.core.javabuilder</name> |
|
|
|
<arguments> |
|
|
|
</arguments> |
|
|
|
</buildCommand> |
|
|
|
<buildCommand> |
|
|
|
<name>org.eclipse.m2e.core.maven2Builder</name> |
|
|
|
<arguments> |
|
|
|
</arguments> |
|
|
|
</buildCommand> |
|
|
|
</buildSpec> |
|
|
|
<natures> |
|
|
|
<nature>org.eclipse.jdt.core.javanature</nature> |
|
|
|
<nature>org.eclipse.m2e.core.maven2Nature</nature> |
|
|
|
</natures> |
|
|
|
</projectDescription> |
|
|
|
======= |
|
|
|
<?xml version="1.0" encoding="UTF-8"?> |
|
|
|
<projectDescription> |
|
|
|
<name>appliction_manager</name> |
|
|
|
@ -45,5 +20,4 @@ |
|
|
|
<nature>org.eclipse.jdt.core.javanature</nature> |
|
|
|
<nature>org.eclipse.m2e.core.maven2Nature</nature> |
|
|
|
</natures> |
|
|
|
</projectDescription> |
|
|
|
>>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git |
|
|
|
</projectDescription> |
maojian
3 months ago