* cxx-pretty-print.c: Correct merge error.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159686 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 072cda0c05fc27ad3467b6b735e5ab0ab3cfa2fc..5275eca53c4a8832a822b63bccaacfa6daf8f73f 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2010-05-21  Joseph Myers  <joseph@codesourcery.com>
+
+       * cxx-pretty-print.c: Correct merge error.
+
 2010-05-21  Joseph Myers  <joseph@codesourcery.com>
 
        * error.c: Include tree-diagnostic.h and tree-pretty-print.h.

diff --git a/gcc/cp/cxx-pretty-print.c b/gcc/cp/cxx-pretty-print.c
index 803257d36b46d4b46ac25606b115c002722fd2e4..04a83140ad9bbe65090e4ab93a144bd686a42a9d 100644 (file)
--- a/gcc/cp/cxx-pretty-print.c
+++ b/gcc/cp/cxx-pretty-print.c
@@ -24,9 +24,9 @@ along with GCC; see the file COPYING3.  If not see
 #include "coretypes.h"
 #include "tm.h"
 #include "intl.h"
-#include "tree-pretty-print.h"
 #include "cp-tree.h"
 #include "cxx-pretty-print.h"
+#include "tree-pretty-print.h"
 #include "toplev.h"
 
 /* Translate if being used for diagnostics, but not for dump files or