remove merge markers

From-SVN: r141943

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 36135eb6554e743007d40d05ca967ebbcee627b0..9b2d2442adee95aac9c3be95ae4493100e54e411 100644 (file)
--- 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