projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8bcebc6)
2007-09-02 Paolo Carlini <pcarlini@suse.de>
authorPaolo Carlini <paolo@gcc.gnu.org>
Sun, 2 Sep 2007 13:06:31 +0000 (13:06 +0000)
committerPaolo Carlini <paolo@gcc.gnu.org>
Sun, 2 Sep 2007 13:06:31 +0000 (13:06 +0000)
* Remove junk in ChangeLog.

From-SVN: r128026

gcc/cp/ChangeLog patch | blob | history

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 43883e659730557a194b5065b6124f2ffa9f9edd..4cb5476a499cc750251762802047959b13f3226d 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -62,7 +62,6 @@
        (get_delta_difference_1): New function.
        (get_delta_difference): Refactor to call get_delta_difference_1.
 
->>>>>>> .r127998
 2007-08-28  Paolo Carlini  <pcarlini@suse.de>
 
        PR c++/33209