From d0b3ec7f3228ceeee5c50d09a0e96372bebfae8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20Sch=C3=A4fer?= <j.wielicki@sotecware.net>
Date: Thu, 22 Nov 2018 18:08:57 +0100
Subject: [PATCH] XEP-0060: Fix broken revision block created by git merge(!)

---
 xep-0060.xml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/xep-0060.xml b/xep-0060.xml
index 38f84a4f..ccb94b82 100644
--- a/xep-0060.xml
+++ b/xep-0060.xml
@@ -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>