XEP-0060: Merge revision blocks for this release, fix broken merge

This commit is contained in:
Jonas Schäfer 2018-11-22 18:09:58 +01:00
parent 3a3f57d945
commit e2cefcfbe6
1 changed files with 3 additions and 10 deletions

View File

@ -52,9 +52,10 @@
<revision>
<version>1.15.6</version>
<date>2018-11-22</date>
<initials>egp</initials>
<initials>jsc (Editor)</initials>
<remark>
<p>Remove unused and never defined 'node' attribute in pubsub#event item schema. This had been added in version 1.8 of the JEP, but never used.</p>
<ul><li>Correct several "entity element(s)" to "&lt;subscription/&gt; element(s)" (mw)</li>
<li>Remove unused and never defined 'node' attribute in pubsub#event item schema. This had been added in version 1.8 of the JEP, but never used. (egp)</li></ul>
</remark>
</revision>
<revision>
@ -77,14 +78,6 @@
<p>Add a new sentence and example about what to do if there are fewer items than requested present in a node.</p>
</remark>
</revision>
<revision>
<version>1.15.3</version>
<date>2018-08-02</date>
<initials>mv</initials>
<remark>
<p>Correct several "entity element(s)" to "&lt;subscription/&gt; element(s)"</p>
</remark>
</revision>
<revision>
<version>1.15.2</version>
<date>2018-05-14</date>