From ea42e18aa39dd7ab3511159f33dc43034e241f6d Mon Sep 17 00:00:00 2001
From: Wichert Akkerman <wakkerma@debian.org>
Date: Mon, 1 Nov 1999 23:09:25 +0000
Subject: [PATCH] Hmm

---
 scripts/dpkg-shlibdeps.pl | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/scripts/dpkg-shlibdeps.pl b/scripts/dpkg-shlibdeps.pl
index af97a46e..56e0bfd9 100755
--- a/scripts/dpkg-shlibdeps.pl
+++ b/scripts/dpkg-shlibdeps.pl
@@ -115,15 +115,7 @@ for ($i=0;$i<=$#exec;$i++) {
 if ($#libpaths >= 0) {
     grep(s/\[\?\*/\\$&/g, @libpaths);
     defined($c= open(P,"-|")) || syserr("cannot fork for dpkg --search");
-<<<<<<< dpkg-shlibdeps.pl
-    if (!$c) {
-        close STDERR; # we don't need to see dpkg's errors
-	open STDERR, "> /dev/null";
-        exec("dpkg","--search","--",@libpaths); syserr("cannot exec dpkg");
-    }
-=======
     if (!$c) { exec("dpkg","--search","--",@libpaths); syserr("cannot exec dpkg"); }
->>>>>>> 1.5
     while (<P>) {
        s/\n$//;
        if (m/^local diversion |^diversion by/) {
-- 
2.39.5