projects / binutils-gdb.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e31716b) | patch
Fix ChangeLog merge conflict
authorSimon Marchi <simon.marchi@polymtl.ca>
Tue, 19 Jun 2018 00:44:50 +0000 (20:44 -0400)
committerSimon Marchi <simon.marchi@polymtl.ca>
Tue, 19 Jun 2018 00:44:50 +0000 (20:44 -0400)
commitf63b508a8709da08448ea68c9db7c5d9f168da0c
treee53c2b7a70f9cd5d478737e08c4bb6be50635c1ftree
parente31716b076446c171d2fcd6a4d4ab7d04e618525commit | diff
Fix ChangeLog merge conflict

I noticed that gdb/testsuite/ChangeLog had some conflict markers... this
patch fixes it.
gdb/testsuite/ChangeLog diff | blob | history