summary refs log tree commit diff
path: root/nixos/doc
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2016-10-13 09:49:47 +0200
committerVladimír Čunát <vcunat@gmail.com>2016-10-13 09:49:47 +0200
commit54a76b3f5d8305dccecb2d6e85f3cb3bc735134a (patch)
tree4cd9f94321cb21c6f49137296954d3759ad4a725 /nixos/doc
parentaf38c055876c5155f29a09dcd3714fbb9aff7b18 (diff)
downloadnixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar.gz
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar.bz2
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar.lz
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar.xz
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.tar.zst
nixpkgs-54a76b3f5d8305dccecb2d6e85f3cb3bc735134a.zip
release-notes: fixup bad conflict resolution in bef6bef
/cc #19324.
Diffstat (limited to 'nixos/doc')
-rw-r--r--nixos/doc/manual/release-notes/rl-1703.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1703.xml b/nixos/doc/manual/release-notes/rl-1703.xml
index 34cdf9c0211..21cea77f876 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>