From 56d9067637ae447a80ff9ec88f18622d135eaa33 Mon Sep 17 00:00:00 2001 From: Peter Neubauer Date: Thu, 20 Oct 2011 19:58:08 +0200 Subject: [PATCH] removing dependency on spatial --- .../springframework/data/neo4j/support/index/IndexType.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java index 60c0c9f42..1d3b3ae3d 100644 --- a/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java +++ b/spring-data-neo4j/src/main/java/org/springframework/data/neo4j/support/index/IndexType.java @@ -17,12 +17,17 @@ package org.springframework.data.neo4j.support.index; import java.util.Map; +<<<<<<< HEAD <<<<<<< HEAD import org.neo4j.graphdb.index.IndexManager; import org.neo4j.helpers.collection.MapUtil; ======= import org.neo4j.gis.spatial.indexprovider.SpatialIndexProvider; >>>>>>> refactoring to support more index types +======= +import org.neo4j.graphdb.index.IndexManager; +import org.neo4j.helpers.collection.MapUtil; +>>>>>>> removing dependency on spatial import org.neo4j.index.impl.lucene.LuceneIndexImplementation; public enum IndexType