|
|
|
@ -12,6 +12,10 @@ |
|
|
|
<attribute name="maven.pomderived" value="true"/> |
|
|
|
</attributes> |
|
|
|
</classpathentry> |
|
|
|
<<<<<<< HEAD |
|
|
|
======= |
|
|
|
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> |
|
|
|
>>>>>>> 14475fcaec8b30c2ab4f67d516c37d8d120c74b1 |
|
|
|
<classpathentry kind="con" path="org.eclipse.m2e.MAVEN2_CLASSPATH_CONTAINER"> |
|
|
|
<attributes> |
|
|
|
<attribute name="maven.pomderived" value="true"/> |
|
|
|
|
