[gnome-continuous] Revert "Tag xkbcommon"

[Emmanuele Bassi <ebassi src gnome org>]

commit c688caa2ce24c6548c16c544015483abdd91a469
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 18 12:56:54 2018 +0100

    Revert "Tag xkbcommon"
    
    This reverts commit 5e70d44deacc480be7d95a677c25c1cfac106d69.
    
    Fix was pushed upstream.

 manifest.json | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 1fe6af8..24d5e57 100644
--- a/manifest.json
+++ b/manifest.json
@@ -384,8 +384,6 @@
                {"src": "fd:xorg/driver/xf86-input-libinput"},
 
                 {"src": "git:https://github.com/xkbcommon/libxkbcommon.git";,
-                 "tag": "c8e17eede52edb0b9a47fa1090b1ed68d9bf2158",
-                 "tag-reason": "https://github.com/xkbcommon/libxkbcommon/issues/64";,
                  "name": "libxkbcommon",
                  "config-opts": ["-Denable-docs=false"]},
 
@@ -1484,7 +1482,13 @@
 
     "initramfs-build-epoch": {"version": 0},
     
+<<<<<<< HEAD
        "build-epoch": {"version": 166,
                        "all": false,
                        "component-names": ["libxkbcommon"]}
+=======
+       "build-epoch": {"version": 165,
+                       "all": true,
+                       "component-names": []}
+>>>>>>> parent of 5e70d44... Tag xkbcommon
 }