From: JINMEI Tatuya <jinmei@isc.org>
Date: Fri, 2 Nov 2012 22:23:32 +0000 (-0700)
Subject: [2372] more conflict resolution
X-Git-Tag: trac2487_base~1^2~21^2~26
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=65fffc8b2838d3d08d9aba54ad9b41099c9e32f7;p=thirdparty%2Fkea.git

[2372] more conflict resolution
---

diff --git a/src/lib/dns/master_lexer.cc b/src/lib/dns/master_lexer.cc
index 3196ddefd4..7eec36fdf0 100644
--- a/src/lib/dns/master_lexer.cc
+++ b/src/lib/dns/master_lexer.cc
@@ -67,7 +67,6 @@ MasterLexer::pushSource(const char* filename, std::string* error) {
         return (false);
     }
 
-    impl_->sources_.push_back(InputSourcePtr(new InputSource(filename)));
     impl_->source_ = impl_->sources_.back().get();
     return (true);
 }