From: Mark Andrews <marka@isc.org>
Date: Tue, 29 May 2018 00:02:29 +0000 (+1000)
Subject: fix merge error
X-Git-Tag: v9.9.13rc1~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24dd75db91b752abe300f54aab6c5597215af351;p=thirdparty%2Fbind9.git

fix merge error
---

diff --git a/lib/dns/master.c b/lib/dns/master.c
index 183cd7b5789..76434651f7b 100644
--- a/lib/dns/master.c
+++ b/lib/dns/master.c
@@ -1032,6 +1032,7 @@ find_free_name(dns_incctx_t *incctx) {
 	return (i);
 }
 
+static isc_result_t
 load_text(dns_loadctx_t *lctx) {
 	dns_rdataclass_t rdclass;
 	dns_rdatatype_t type, covers;