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

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

434d9eece338a156239bc975ff0d983fbb8aa9b4