[gnome-continuous] Fix the revert conflict

[Emmanuele Bassi <ebassi src gnome org>]

commit 4452f21956f65bc3cfd26cd5d95f2392cd8a2ef0
Author: Emmanuele Bassi <ebassi gnome org>
Date:   Wed Jul 18 12:58:17 2018 +0100

    Fix the revert conflict
    
    The fact that Git still doesn't warn you that you're committing chunks
    with conflict markers is a tragedy.

 manifest.json | 6 ------
 1 file changed, 6 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index 24d5e57..dc5ebbf 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1482,13 +1482,7 @@
 
     "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
 }