release-notes: fixup bad conflict resolution in bef6bef

/cc #19324.
This commit is contained in:
Vladimír Čunát 2016-10-13 09:49:47 +02:00
parent af38c05587
commit 54a76b3f5d

View File

@ -50,6 +50,7 @@ following incompatible changes:</para>
which prevents ptracing non-child processes.
This means you will not be able to attach gdb to an existing process,
but will need to start that process from gdb (so it is a child).
</para>
</listitem>
<listitem>