Bug 1381842 - follwup: Fix wpt manifest file, r=bustage-fix a=bustage-fix

CLOSED TREE

MozReview-Commit-ID: 8k58hsVAVec

testing/web-platform/meta/MANIFEST.json

@@ -530409,7 +530409,7 @@
    "testharness"
   ],
   "css/css-variables-1/vars-font-shorthand-001.html": [
-   "52b5d737026e63f382b2f626fe3039a529005db1",
+   "3bf57061c42fc53df70f934f389554f2a95814ed",
    "reftest"
   ],
   "css/css-writing-modes-3/OWNERS": [
@@ -604913,11 +604913,7 @@
    "testharness"
   ],
   "preload/reflected-as-value.html": [
-<<<<<<< working copy
-   "b1a90765d8823f084cbced261663205ccc6cfac0",
-=======
    "28b98f82200b0c3461a9ff440df454a254f5e62a",
->>>>>>> merge rev
    "testharness"
   ],
   "preload/resources/A4.ogv": [
@@ -614860,13 +614856,8 @@
    "d81c494e7c0aedc7921c6d5a8c7a17b9b1f5a8aa",
    "support"
   ],
-<<<<<<< working copy
-  "service-workers/service-worker/resources/opaque-response-preloaded-iframe.html": [
-   "df5f1602891ffd5344dfcdf8d2e406f27b3f54e8",
-=======
   "service-workers/service-worker/resources/opaque-response-being-preloaded-xhr.html": [
    "d42457f8fdee9f0608f3cccc37872cbed3fe4eb9",
->>>>>>> merge rev
    "support"
   ],
   "service-workers/service-worker/resources/opaque-response-preloaded-worker.js": [