From: Adam Dickmeiss Date: Mon, 25 Jan 2010 12:20:24 +0000 (+0100) Subject: medium: merge=longest X-Git-Tag: v1.4.0~169 X-Git-Url: http://sru.miketaylor.org.uk/?a=commitdiff_plain;h=17de8c215f895b2ae8bf9850f2fa74ac8787dd2c;p=pazpar2-moved-to-github.git medium: merge=longest --- diff --git a/etc/default.xml b/etc/default.xml index 78a1514..a3c5c7f 100644 --- a/etc/default.xml +++ b/etc/default.xml @@ -52,7 +52,7 @@ - +