fix the prior/broken merge commit.

Author: dtrace4linux

tools/mkport.pl

@@ -361,11 +361,8 @@ sub check_dwarf_h
 int main(int argc, char **argv)
 {
 	dwarf_begin();
-<<<<<<< HEAD
-	return 0;
-=======
 	dwarf_loclist();
->>>>>>> 8ee119b297aa0b30d99ac5817b99d342bf7edab5
+	return 0;
 }
 EOF
 	$fh->close();