Sleepinglion has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353020 )
Change subject: Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks
......................................................................
Merge branch 'master' of
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks
RelatedLinks.hooks.php
i18n/en.json
i18n/ko.json
modules/ext.related_links.js
수정함: RelatedLinks.hooks.php
수정함: extension.json
수정함: i18n/en.json
수정함: i18n/ko.json
새 파일: i18n/qqq.json
수정함: modules/ext.related_links.css
수정함: modules/ext.related_links.js
Change-Id: Icbad706e9fb81db4b8744f8434b7ef971169d53f
---
M RelatedLinks.hooks.php
M i18n/en.json
M i18n/ko.json
M modules/ext.related_links.js
4 files changed, 8 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/RelatedLinks
refs/changes/20/353020/1
diff --git a/RelatedLinks.hooks.php b/RelatedLinks.hooks.php
index e43ab50..d5f7bfe 100755
--- a/RelatedLinks.hooks.php
+++ b/RelatedLinks.hooks.php
@@ -5,7 +5,7 @@
* @file
* @ingroup Extensions
*/
-<<<<<<< HEAD (30b8bd 수정함: RelatedLinks.hooks.php 수정함:
RelatedLink)
+<<<<<<< HEAD
function initiateSettingsForRelatedLinks()
{
@@ -159,4 +159,4 @@
->>>>>>> BRANCH (b4e64b Fix bad newlines)
+>>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/i18n/en.json b/i18n/en.json
index ab41f6b..c13ae30 100755
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (30b8bd 수정함: RelatedLinks.hooks.php 수정함:
RelatedLink)
+<<<<<<< HEAD
{
"@metadata": {
"authors": "Sleeping-Lion"
@@ -45,4 +45,4 @@
"delete": "Delete",
"modify_all": "Modify All"
}
->>>>>>> BRANCH (b4e64b Fix bad newlines)
+>>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/i18n/ko.json b/i18n/ko.json
index 27b6a82..b122d2d 100755
--- a/i18n/ko.json
+++ b/i18n/ko.json
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (30b8bd 수정함: RelatedLinks.hooks.php 수정함:
RelatedLink)
+<<<<<<< HEAD
{
"@metadata": {
"authors": "잠자는-사자"
@@ -44,4 +44,4 @@
"delete": "삭제",
"modify_all": "수정 적용"
}
->>>>>>> BRANCH (b4e64b Fix bad newlines)
+>>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
diff --git a/modules/ext.related_links.js b/modules/ext.related_links.js
index 6f451a6..80e1abf 100755
--- a/modules/ext.related_links.js
+++ b/modules/ext.related_links.js
@@ -1,4 +1,4 @@
-<<<<<<< HEAD (30b8bd 수정함: RelatedLinks.hooks.php 수정함:
RelatedLink)
+<<<<<<< HEAD
$(document).ready(function(){
$('#checkall').change(function () {
if($(this).is(':checked')) {
@@ -79,4 +79,4 @@
});
return is_checked;
}
->>>>>>> BRANCH (b4e64b Fix bad newlines)
+>>>>>>> b4e64bc2396e3fbd9d14ce219680c50203de90d1
--
To view, visit https://gerrit.wikimedia.org/r/353020
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icbad706e9fb81db4b8744f8434b7ef971169d53f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/RelatedLinks
Gerrit-Branch: master
Gerrit-Owner: Sleepinglion <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
