From 3660a59b8eedc92e9e3ca9b1abf8eb5a01413558 Mon Sep 17 00:00:00 2001
From: barblade <barblade07@gmail.com>
Date: Sat, 14 Jun 2014 12:02:22 +0200
Subject: [PATCH] Classpath edit

---
 .classpath | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.classpath b/.classpath
index 838a207..2079c81 100644
--- a/.classpath
+++ b/.classpath
@@ -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"/>