mirror of
https://github.com/moparisthebest/xeps
synced 2024-11-25 02:32:18 -05:00
XEP-0060: Fix broken revision block created by git merge(!)
This commit is contained in:
parent
945652bf33
commit
d0b3ec7f32
16
xep-0060.xml
16
xep-0060.xml
@ -49,6 +49,14 @@
|
|||||||
&pgmillard;
|
&pgmillard;
|
||||||
&stpeter;
|
&stpeter;
|
||||||
&ralphm;
|
&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>
|
<revision>
|
||||||
<version>1.15.5</version>
|
<version>1.15.5</version>
|
||||||
<date>2018-11-03</date>
|
<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>
|
<p>Add a new sentence and example about what to do if there are fewer items than requested present in a node.</p>
|
||||||
</remark>
|
</remark>
|
||||||
</revision>
|
</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>
|
<revision>
|
||||||
<version>1.15.2</version>
|
<version>1.15.2</version>
|
||||||
<date>2018-05-14</date>
|
<date>2018-05-14</date>
|
||||||
|
Loading…
Reference in New Issue
Block a user