Re: [2dcontext-tests][FileAPI-tests][IndexedDB-tests][XMLHttpRequest-tests][annotation-model-tests][cors-tests][custom-elements-tests][dom-tests][domparsing-tests][encrypted-media-tests][fetch-tests][html-tests][media-source-tests][payment-request-tests][pointerevents-tests][presentation-api-tests][referrer-policy-tests] Annotation automated (#3356) from Michael[tm] Smith on 2016-08-13 (public-web-platform-tests-notifications@w3.org from August 2016)

From: Michael[tm] Smith <web-platform-tests-notifications@w3.org>
Date: Sat, 13 Aug 2016 06:16:43 GMT
To: public-web-platform-tests-notifications@w3.org
Message-Id: <<web-platform-tests_issue_3356_1471069003965@w3.org>>

This has a conflict in `annotation-model/tools/make_tests.py` that needs to be resolved:
```
<<<<<<< 4b40dcd67fa54129251849024211bfc520cc7797
template = open(TEMPLATE, "r").read()
=======
manualTemplate = open(MANUAL_TEMPLATE).read()
autoTemplate = open(JS_TEMPLATE).read()
>>>>>>> Support for automated JSON tests
```

View on GitHub: https://github.com/w3c/web-platform-tests/pull/3356#issuecomment-239605033

Received on Saturday, 13 August 2016 06:16:50 UTC