[gnome-continuous] manifest: Fix git conflict in previous commit

[Javier Jardón Cabezas <jjardon src gnome org>]

commit ad3afd1282d39af4ba7fc9363fafaf0ae6895d4e
Author: Javier Jardón <jjardon gnome org>
Date:   Sun Mar 12 18:06:31 2017 +0000

    manifest: Fix git conflict in previous commit

 manifest.json |    5 -----
 1 files changed, 0 insertions(+), 5 deletions(-)
---
diff --git a/manifest.json b/manifest.json
index e363d23..53b61ac 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1202,14 +1202,9 @@
 
                {"src": "gnome:gnome-logs"},
 
-<<<<<<< Updated upstream
                {"src": "gnome:seahorse"},
 
-               {"src": "gnome:totem",
-                "config-opts": ["--disable-vala"]},
-=======
                {"src": "gnome:totem"},
->>>>>>> Stashed changes
 
                {"src": "gnome:libgda",
                 "branch": "LIBGDA_5.2"},