diff options
| author | Simon Marchi <simon.marchi@polymtl.ca> | 2018-06-18 20:44:50 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@polymtl.ca> | 2018-06-18 20:44:50 -0400 |
| commit | f63b508a8709da08448ea68c9db7c5d9f168da0c (patch) | |
| tree | e53c2b7a70f9cd5d478737e08c4bb6be50635c1f /sim | |
| parent | e31716b076446c171d2fcd6a4d4ab7d04e618525 (diff) | |
| download | gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.zip gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.tar.gz gdb-f63b508a8709da08448ea68c9db7c5d9f168da0c.tar.bz2 | |
Fix ChangeLog merge conflict
I noticed that gdb/testsuite/ChangeLog had some conflict markers... this
patch fixes it.
Diffstat (limited to 'sim')
0 files changed, 0 insertions, 0 deletions