From f262d92a154d047835965cf484ea42be599b8f11 Mon Sep 17 00:00:00 2001
From: mmitchel <>
Date: Wed, 9 May 2007 04:31:15 +0000
Subject: Remove conflict marker

---
 libstdc++-v3/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 2e8282eba07..ba607dc98d5 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -102,7 +102,6 @@
 	* testsuite/23_containers/vector/requirements/dr438/
 	constructor_2_neg.cc: Likewise.
 
->>>>>>> .r124554
 2007-05-07  Mark Mitchell  <mark@codesourcery.com>
 
 	* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): For
-- 
cgit v1.2.3