Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Fix rmuir's inadvertant commit of conflict info

  • Loading branch information...
commit 26ce5c2c7d720323a952fd38e2eb736b9a8d506d 1 parent fea8511
@hossman hossman authored
Showing with 0 additions and 17 deletions.
  1. +0 −17 .gitignore
View
17 .gitignore
@@ -1,18 +1,3 @@
-<<<<<<< HEAD
-solr/build
-lucene/build
-build
-data
-db-*.jar
-je-*.jar
-target
-lucene-libs
-dist
-.classpath
-.project
-.settings/
-bin/
-=======
*.jar
@@ -34,8 +19,6 @@ bin/
/bin
/bin.*
/pom.xml
->>>>>>> d2048c027917442b4d345d2e7102043845ecec41
-
# ./lucene
/lucene/build
Please sign in to comment.
Something went wrong with that request. Please try again.