From: Jason Merrill <jason@gcc.gnu.org>
Date: Mon, 17 Nov 2008 13:53:02 +0000 (-0500)
Subject: remove merge markers
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c1770e626f2fa4755e0060063178c7c6ccbec14e;p=thirdparty%2Fgcc.git

remove merge markers

From-SVN: r141943
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 36135eb6554e..9b2d2442adee 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,3 @@
-<<<<<<< .working
-=======
 2008-11-14  Jason Merrill  <jason@redhat.com>
 
 	PR c++/38030
@@ -9,7 +7,6 @@
 	PR c++/37740
 	* call.c (build_aggr_conv): Increment i.
 
->>>>>>> .merge-right.r141866
 2008-11-13  Jason Merrill  <jason@redhat.com>
 
 	PR c++/37932