aboutsummaryrefslogtreecommitdiffstats
path: root/erts/doc/src
diff options
context:
space:
mode:
authorHenrik Nord <[email protected]>2014-07-25 09:11:35 +0200
committerHenrik Nord <[email protected]>2014-07-25 09:11:35 +0200
commit62081266545df8f5eda8e2043f33055cfe575126 (patch)
treedc93dae0f598aa576ffc782ef0182b2ca86fa787 /erts/doc/src
parent7bb870b42928264cab08977349e2f8bf78645c1b (diff)
downloadotp-62081266545df8f5eda8e2043f33055cfe575126.tar.gz
otp-62081266545df8f5eda8e2043f33055cfe575126.tar.bz2
otp-62081266545df8f5eda8e2043f33055cfe575126.zip
fix xml file merge messup
Diffstat (limited to 'erts/doc/src')
-rw-r--r--erts/doc/src/notes.xml6
1 files changed, 6 insertions, 0 deletions
diff --git a/erts/doc/src/notes.xml b/erts/doc/src/notes.xml
index 50de3c5d4d..5c4bb3ed25 100644
--- a/erts/doc/src/notes.xml
+++ b/erts/doc/src/notes.xml
@@ -940,6 +940,12 @@
Thanks to Matwey V. Kornilov</p>
<p>
Own Id: OTP-11829</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Erts 5.10.4.1</title>
<section><title>Known Bugs and Problems</title>