Commit bdbe1f09 authored by Georg Fette's avatar Georg Fette
Browse files

Merge branch 'master' of

https://gitlab2.informatik.uni-wuerzburg.de/gef18bg/cdw_querymapper

Conflicts:
	QueryMapper/.classpath
	QueryMapper/.settings/org.eclipse.jdt.core.prefs
parents 6b61888f 6ddaa6ac
eclipse.preferences.version=1
encoding//src/main/java=UTF-8
encoding//src/main/resources=UTF-8
encoding//src/test/java=UTF-8
encoding//src/test/resources=UTF-8
encoding/<project>=UTF-8
activeProfiles=
eclipse.preferences.version=1
resolveWorkspaceProjects=true
version=1
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