Reedy has uploaded a new change for review.
https://gerrit.wikimedia.org/r/159359
Change subject: gj Reedy. Remove merge conflict
......................................................................
gj Reedy. Remove merge conflict
Change-Id: If3bf3722e956b44052f987723552bc44ba131cdf
---
M wikiversions.json
1 file changed, 0 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/59/159359/1
diff --git a/wikiversions.json b/wikiversions.json
index 25ba1a7..57f8f97 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,5 +1,4 @@
{
-<<<<<<< HEAD
"aawiki": "php-1.24wmf19",
"aawikibooks": "php-1.24wmf20",
"aawiktionary": "php-1.24wmf20",
--
To view, visit https://gerrit.wikimedia.org/r/159359
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If3bf3722e956b44052f987723552bc44ba131cdf
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Reedy <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
