XEP-0060: Fix broken revision block created by git merge(!)

This commit is contained in:
Jonas Schäfer 2018-11-22 18:08:57 +01:00
parent 945652bf33
commit d0b3ec7f32
1 changed files with 8 additions and 8 deletions

View File

@ -49,6 +49,14 @@
&pgmillard;
&stpeter;
&ralphm;
<revision>
<version>1.15.6</version>
<date>2018-11-22</date>
<initials>egp</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>
</remark>
</revision>
<revision>
<version>1.15.5</version>
<date>2018-11-03</date>
@ -69,14 +77,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>egp</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>
</remark>
</revision>
<revision>
<version>1.15.2</version>
<date>2018-05-14</date>