projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1f28c66)
remove conflicts
authorAldy Hernandez <aldyh@gcc.gnu.org>
Fri, 20 Jul 2001 10:36:09 +0000 (10:36 +0000)
committerAldy Hernandez <aldyh@gcc.gnu.org>
Fri, 20 Jul 2001 10:36:09 +0000 (10:36 +0000)
From-SVN: r44191

gcc/ChangeLog patch | blob | history

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fc8edcd342b549e45eafa45d67cf283ac9930a6b..51df8fed28a7cd9499ba672636c29189928a0f73 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -125,7 +125,6 @@
        previous args.
        (copy_object): Caller changed.
 
->>>>>>> 1.10722
 2001-07-19  Andreas Schwab  <schwab@suse.de>
 
        * configure.in (assembler dwarf2 debug_line support): Define nop