From a74cd17ab62821d2cbaa4475dcffc3e11c08b2b7 Mon Sep 17 00:00:00 2001
From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Jan 2010 22:47:24 +0100
Subject: fix merge error

---
 apt-pkg/contrib/configuration.cc | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'apt-pkg')

diff --git a/apt-pkg/contrib/configuration.cc b/apt-pkg/contrib/configuration.cc
index 08faf22b5..aaa669ffc 100644
--- a/apt-pkg/contrib/configuration.cc
+++ b/apt-pkg/contrib/configuration.cc
@@ -829,6 +829,8 @@ bool ReadConfigFile(Configuration &Conf,const string &FName,bool AsSectional,
 // ReadConfigDir - Read a directory of config files			/*{{{*/
 // ---------------------------------------------------------------------
 /* */
+bool ReadConfigDir(Configuration &Conf,const string &Dir,
+		   bool AsSectional, unsigned Depth)
 {
    vector<string> const List = GetListOfFilesInDir(Dir, "", true);
 
-- 
cgit v1.2.3