release-notes: fixup bad conflict resolution in bef6bef

/cc #19324.
2016-10-13 09:49:47 +02:00 · 2016-10-13 09:49:47 +02:00 · 54a76b3f5d
commit 54a76b3f5d
parent af38c05587
1 changed files with 1 additions and 0 deletions
--- a/nixos/doc/manual/release-notes/rl-1703.xml
+++ b/nixos/doc/manual/release-notes/rl-1703.xml
@ -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>