.project and .classpath should be inside VCpull/2297/merge
@@ -11,9 +11,6 @@ local.properties | |||
.loadpath | |||
.recommenders | |||
# Eclipse Core | |||
.project | |||
# External tool builders | |||
.externalToolBuilders/ | |||
@@ -26,9 +23,6 @@ local.properties | |||
# CDT-specific (C/C++ Development Tooling) | |||
.cproject | |||
# JDT-specific (Eclipse Java Development Tools) | |||
.classpath | |||
# Java annotation processor (APT) | |||
.factorypath | |||