From 54a76b3f5d8305dccecb2d6e85f3cb3bc735134a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <vcunat@gmail.com>
Date: Thu, 13 Oct 2016 09:49:47 +0200
Subject: [PATCH] release-notes: fixup bad conflict resolution in bef6bef

/cc #19324.
---
 nixos/doc/manual/release-notes/rl-1703.xml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 34cdf9c02118..21cea77f8768 100644
--- 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>