Raimond Spekking has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/334757 )
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParentPage into i18nfixes
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParentPage into i18nfixes
Change-Id: Ibf9fcecd6f23d75469688934819c98853f5b3cfc
---
M i18n/en.json
1 file changed, 1 insertion(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParentPage
refs/changes/57/334757/1
diff --git a/i18n/en.json b/i18n/en.json
index 25ca7d0..b01676a 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,16 +1,9 @@
{
-<<<<<<< HEAD (93121e Consistency tweaks for translatewiki.net)
- "authors": [
- "Leonid Verhovskij"
- ],
- "parentpage-desc": "Provides special semantic property \"parent page\"
on subpages",
-=======
"@metadata": {
"authors": [
"Leonid Verhovskij"
]
},
- "parentpage-desc": "provide special semantic property \"parent page\"
on subpages",
->>>>>>> BRANCH (e22ecd Add grunt-jsonlint and grunt-banana-checker)
+ "parentpage-desc": "Provides special semantic property \"parent page\"
on subpages",
"prefs-parentpage": "Parent page"
}
--
To view, visit https://gerrit.wikimedia.org/r/334757
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibf9fcecd6f23d75469688934819c98853f5b3cfc
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParentPage
Gerrit-Branch: master
Gerrit-Owner: Raimond Spekking <raimond.spekk...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
