[gcc/devel/nothrow-detection] resolved more conflicts

[Pranil Dey via Gcc-cvs]

https://gcc.gnu.org/g:27be11a6b2fe5c91f60460e01c30ca5c4fddf58a

commit 27be11a6b2fe5c91f60460e01c30ca5c4fddf58a
Author: Pranil Dey <mkd...@gmail.com>
Date:   Tue Oct 1 10:12:35 2024 +0530

    resolved more conflicts

Diff:
---
 gcc/tree-eh.h | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gcc/tree-eh.h b/gcc/tree-eh.h
index 4fa134b43ddc..978bc6228bf0 100644
--- a/gcc/tree-eh.h
+++ b/gcc/tree-eh.h
@@ -34,8 +34,6 @@ extern int lookup_stmt_eh_lp (const gimple *);
 extern bool make_eh_dispatch_edges (geh_dispatch *);
 extern bool match_lp (eh_landing_pad, vec<tree> *);
 extern void update_stmt_eh_region(gimple *);
-extern bool match_lp (eh_landing_pad, vec<tree> *);
-extern void update_stmt_eh_region(gimple *);
 extern edge make_eh_edge (gimple *);
 extern edge redirect_eh_edge (edge, basic_block);
 extern void redirect_eh_dispatch_edge (geh_dispatch *, edge, basic_block);