From: Mike Taylor <mike@indexdata.com>
Date: Thu, 28 Apr 2016 13:59:35 +0000 (+0100)
Subject: Resolve completely trivial alleged conflict that git should have been able to handle... 
X-Git-Tag: v0.10~19
X-Git-Url: http://git.indexdata.com/?p=lui-solr.git;a=commitdiff_plain;h=434d9eece338a156239bc975ff0d983fbb8aa9b4;hp=7bc76f399a89654ee107a9dfe0b60770c4dfd264

Resolve completely trivial alleged conflict that git should have been able to handle standing on its head
---

diff --git a/README b/README
index fcae252..5444f0f 100644
--- a/README
+++ b/README
@@ -17,3 +17,11 @@ Adding a new record with the same id mean override the old record with new data.
 
 To build the Debian packages:
 $ ../git-tools/id-deb-build/id-mk-deb-changelog.sh && dpkg-buildpackage -us -uc
+
+And to install a master Solr under Tomcat 8:
+$ cd ..
+$ sudo dpkg -i masterkey-lui-solr4-common_*.indexdata_all.deb 
+$ sudo dpkg -i masterkey-lui-solr4-common-tomcat8_*.indexdata_all.deb 
+$ sudo dpkg -i masterkey-lui-solr4-master_*.indexdata_all.deb 
+$ sudo dpkg -i masterkey-lui-solr4-master-tomcat8_*.indexdata_all.deb 
+
diff --git a/debian/.gitignore b/debian/.gitignore
index e437d9f..b25059b 100644
--- a/debian/.gitignore
+++ b/debian/.gitignore
@@ -1,3 +1,4 @@
+changelog
 files
 masterkey-*/
 *.substvars
diff --git a/dist/solr-4.4.0.war b/dist/solr-4.4.0.war
deleted file mode 100644
index 15ceec5..0000000
Binary files a/dist/solr-4.4.0.war and /dev/null differ
diff --git a/dist/solr-4.6.0.war b/dist/solr-4.6.0.war
deleted file mode 100644
index 7b577ca..0000000
Binary files a/dist/solr-4.6.0.war and /dev/null differ