From: Adam Dickmeiss <adam@indexdata.dk>
Date: Tue, 13 Oct 2009 11:03:52 +0000 (+0200)
Subject: Fix type of mergekey
X-Git-Tag: v1.2.3~28
X-Git-Url: http://git.indexdata.com/?a=commitdiff_plain;h=bfd5677964f51d5ef64bf075c0835b87bc3ee049;hp=eac3b928ecbef5cbe4b4c1bd7f82d5d2faaae45c;p=pazpar2-moved-to-github.git

Fix type of mergekey
---

diff --git a/src/pazpar2_config.h b/src/pazpar2_config.h
index acaba34..79bd227 100644
--- a/src/pazpar2_config.h
+++ b/src/pazpar2_config.h
@@ -77,7 +77,7 @@ struct conf_metadata
     enum conf_metadata_type type;
     enum conf_metadata_merge merge;
     enum conf_setting_type setting; // Value is to be taken from session/db settings?
-    enum conf_metadata_type mergekey;
+    enum conf_metadata_mergekey mergekey;
 };