X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=blobdiff_plain;f=libstdc%2B%2B-v3%2FChangeLog;h=c97b588dcdde781a33a0c689ba6b7b967d9bd3c2;hp=27757d073326d30ee9d21949167080dbe3dd4aac;hb=3153541240fcc3e5524de4986da57f12a98ac6bd;hpb=91512d885896e3de2384dacb5f8fc7b9028468b1

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 27757d07332..c97b588dcdd 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,15 +1,12 @@
-<<<<<<< .mine
 2009-08-14  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* include/ext/pointer.h: Add pragma system_header, use
 	_GLIBCXX_USE_LONG_LONG, macro cleanup.
 
-=======
 2009-08-14  Uros Bizjak  <ubizjak@gmail.com>
 
 	* src/compatibility-ldbl.cc: Include cmath.
 
->>>>>>> .r150760
 2009-08-13  Benjamin Kosnik  <bkoz@redhat.com>
 
 	* src/compatibility-ldbl.cc: Include tr1/functional.