From: Michael Vogt <michael.vogt@ubuntu.com>
Date: Fri, 8 Jan 2010 21:47:24 +0000 (+0100)
Subject: fix merge error
X-Git-Tag: 0.7.25.1~4
X-Git-Url: https://git.saurik.com/apt.git/commitdiff_plain/a74cd17ab62821d2cbaa4475dcffc3e11c08b2b7?hp=9ba25fb7d6ae555a6cdf8772ed49f00bde90af41

fix merge error
---

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);