Commit e594ea01 authored by Tobias Meuser's avatar Tobias Meuser
Browse files

Merge branch 'tm/master-thesis-bjoern-bueschke' of...

Merge branch 'tm/master-thesis-bjoern-bueschke' of ssh://dev.kom.e-technik.tu-darmstadt.de/simonstrator/simonstrator-peerfactsim into tm/master-thesis-bjoern-bueschke
parents 22d0ec84 08e9d48d
......@@ -6,7 +6,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry including="**/*.java" kind="src" path="TraaS"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="maven.pomderived" value="true"/>
......@@ -17,5 +16,6 @@
<attribute name="maven.pomderived" value="true"/>
</attributes>
</classpathentry>
<classpathentry combineaccessrules="false" kind="src" path="/TraaS"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
......@@ -24,7 +24,7 @@
<link>
<name>TraaS</name>
<type>2</type>
<location>C:/Users/ZZFTT7/simonstrator-workspace/TraaS/src</location>
<location>/Users/Bjoern/Eclipse/eclipse-workspace/TraaS</location>
</link>
</linkedResources>
</projectDescription>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment