Ustawianie karety na początek przepisu/składników

2014-06-14 12:32:09 +02:00
parent 1ce3b3cde5
commit 595534cf26
3 changed files with 6 additions and 5 deletions
--- a/.classpath
+++ b/.classpath
@@ -12,10 +12,6 @@
 			<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"/>