jenkins-bot has submitted this change and it was merged.
Change subject: Merge branch 'master' into wmf_deploy
......................................................................
Merge branch 'master' into wmf_deploy
Change-Id: Ibda79896adf93e3c465d394dc9e979c70e04a0b9
---
M tests/data/AllocationsFixtures.json
1 file changed, 0 insertions(+), 40 deletions(-)
Approvals:
AndyRussG: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/data/AllocationsFixtures.json
b/tests/data/AllocationsFixtures.json
index c648cf6..3febe7d 100644
--- a/tests/data/AllocationsFixtures.json
+++ b/tests/data/AllocationsFixtures.json
@@ -1,48 +1,8 @@
-<<<<<<< HEAD (6b22bf Instrumentation to report when alterImpressionData is
not fo)
-[
- [ {
- "title": "completeness",
- "fixture": {
- "campaigns": [
- {
- "category": "fundraising",
- "preferred": 1,
- "throttle": 50,
- "geotargeted": true,
- "geo_countries": [
- "FR",
- "GR",
- "XX"
- ],
- "banners": [
- {
- "name": "b1",
- "weight": 5,
- "display_anon": 1
- }
- ]
- }
- ]
- },
- "choices": [
- {
- "preferred": 1,
- "throttle": 50,
- "bucket_count": 1,
- "geotargeted": true,
- "countries": [
- "FR",
- "GR",
- "XX"
- ],
- "banners": [
-=======
{
"test_cases": {
"completeness": {
"setup": {
"campaigns": [
->>>>>>> BRANCH (bc7c6f Test fixtures: standardize props on underscores)
{
"name": "c1",
"enabled": 1,
--
To view, visit https://gerrit.wikimedia.org/r/187692
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibda79896adf93e3c465d394dc9e979c70e04a0b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CentralNotice
Gerrit-Branch: wmf_deploy
Gerrit-Owner: AndyRussG <[email protected]>
Gerrit-Reviewer: AndyRussG <[email protected]>
Gerrit-Reviewer: Awight <[email protected]>
Gerrit-Reviewer: Ejegg <[email protected]>
Gerrit-Reviewer: Mwalker <[email protected]>
Gerrit-Reviewer: Ssmith <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
