prøver

prøver
Merge branch 'master' of https://github.com/SDKR/Test

Conflicts:

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.history/40/90761
a79ce470014158ed91d183efa45

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/TCPServ
er/.indexes/e4/history.index

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/TCPServ
er/.markers

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/TCPServ
er/org.eclipse.jdt.core/state.dat

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/UDPClie
nt/.indexes/e4/history.index

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/UDPClie
nt/.markers

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/UDPClie
nt/org.eclipse.jdt.core/state.dat

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/UdpServ
erClient/.markers

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.projects/UdpServ
erClient/org.eclipse.jdt.core/state.dat

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.root/.indexes/pr
operties.index

JavaKode/.metadata/.plugins/org.eclipse.core.resources/.safetable/org.ec
lipse.core.resources

JavaKode/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.debug.ui.prefs

JavaKode/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.jdt.core.prefs

JavaKode/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.jdt.launching.prefs

JavaKode/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.jdt.ui.prefs

JavaKode/.metadata/.plugins/org.eclipse.core.runtime/.settings/org.eclip
se.ui.ide.prefs
	JavaKode/.metadata/.plugins/org.eclipse.debug.core/.launches/Mainn
(2).launch

JavaKode/.metadata/.plugins/org.eclipse.debug.ui/launchConfigurationHist
ory.xml
	JavaKode/.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/1917121814.index
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/2172906012.index
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/762399427.index
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/855630358.index
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache
	JavaKode/.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

JavaKode/.metadata/.plugins/org.eclipse.jdt.core/variablesAndContainers.
dat
	JavaKode/.metadata/.plugins/org.eclipse.jdt.launching/.install.xml
	JavaKode/.metadata/.plugins/org.eclipse.jdt.launching/libraryInfos.xml
	JavaKode/.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

JavaKode/.metadata/.plugins/org.eclipse.pde.core/.cache/clean-cache.prop
erties

JavaKode/.metadata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml
	JavaKode/TCPServer/.classpath