Conflict

...sources/.projects/project6/org.eclipse.jdt.core/state.dat

...ns/org.eclipse.core.resources/.projects/project7/.markers

...g.eclipse.core.resources/.projects/project7/.markers.snap

....eclipse.core.resources/.projects/project7/.syncinfo.snap

...sources/.projects/project7/org.eclipse.jdt.core/state.dat

...ns/org.eclipse.core.resources/.projects/project8/.markers

...g.eclipse.core.resources/.projects/project8/.markers.snap

....eclipse.core.resources/.projects/project8/.syncinfo.snap

...sources/.projects/project8/org.eclipse.jdt.core/state.dat

...ipse.core.resources/.projects/temp/.indexes/history.index

...lugins/org.eclipse.core.resources/.projects/temp/.markers

...s/org.eclipse.core.resources/.projects/temp/.markers.snap

.../org.eclipse.core.resources/.projects/temp/.syncinfo.snap

...e.resources/.projects/temp/org.eclipse.jdt.core/state.dat

...a/.plugins/org.eclipse.core.resources/.root/.markers.snap

.metadata/.plugins/org.eclipse.core.resources/.root/20.tree

...ipse.core.resources/.safetable/org.eclipse.core.resources

.metadata/.plugins/org.eclipse.core.resources/.snap

...eclipse.core.runtime/.settings/org.eclipse.debug.ui.prefs

...ugins/org.eclipse.debug.ui/launchConfigurationHistory.xml