<<<<<<< HEAD bigmodel org.eclipse.jdt.core.javabuilder org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature ======= appliction_manager org.eclipse.jdt.core.javabuilder org.eclipse.m2e.core.maven2Builder org.eclipse.jdt.core.javanature org.eclipse.m2e.core.maven2Nature >>>>>>> branch 'master' of http://82.156.111.58:3000/maojian/appliction_manager.git