]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[2372] more conflict resolution
authorJINMEI Tatuya <jinmei@isc.org>
Fri, 2 Nov 2012 22:23:32 +0000 (15:23 -0700)
committerJINMEI Tatuya <jinmei@isc.org>
Fri, 2 Nov 2012 22:23:32 +0000 (15:23 -0700)
src/lib/dns/master_lexer.cc

index 3196ddefd4be88fa38e7b4f621960d8a5ad01d06..7eec36fdf0795ceec2cc967106118d158179a276 100644 (file)
@@ -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);
 }