Conflict

.metadata/.plugins/org.eclipse.e4.workbench/workbench.xmi

.metadata/.plugins/org.eclipse.jdt.core/1252676772.index

.metadata/.plugins/org.eclipse.jdt.core/1375964667.index

.metadata/.plugins/org.eclipse.jdt.core/2603447019.index

.metadata/.plugins/org.eclipse.jdt.core/3693723811.index

...data/.plugins/org.eclipse.jdt.core/externalLibsTimeStamps

.metadata/.plugins/org.eclipse.jdt.core/nonChainingJarsCache

.metadata/.plugins/org.eclipse.jdt.core/savedIndexNames.txt

.../.plugins/org.eclipse.jdt.core/variablesAndContainers.dat

.metadata/.plugins/org.eclipse.jdt.launching/.install.xml

.metadata/.plugins/org.eclipse.jdt.ui/dialog_settings.xml

.metadata/.plugins/org.eclipse.ui.ide/dialog_settings.xml

...ata/.plugins/org.eclipse.ui.workbench/dialog_settings.xml

.metadata/.plugins/org.eclipse.ui.workbench/workingsets.xml

mini1/.classpath

mini1/.project

mini1/.settings/org.eclipse.jdt.core.prefs

mini1/SUBMIT_THIS_mini1.zip

mini1/speccheck_mini1.jar

project10/.gitignore