fix merge error
authorMichael Vogt <michael.vogt@ubuntu.com>
Fri, 8 Jan 2010 21:47:24 +0000 (22:47 +0100)
committerMichael Vogt <michael.vogt@ubuntu.com>
Fri, 8 Jan 2010 21:47:24 +0000 (22:47 +0100)
commita74cd17ab62821d2cbaa4475dcffc3e11c08b2b7
treea41ec0a8e19fc1da0cb8aaef5d3e419944a614c3
parent9ba25fb7d6ae555a6cdf8772ed49f00bde90af41
fix merge error
apt-pkg/contrib/configuration.cc