Ankita-ks has uploaded a new change for review.
https://gerrit.wikimedia.org/r/222853
Change subject: Removed residual lines from merge conflicts
......................................................................
Removed residual lines from merge conflicts
Change-Id: I8ec5c9d377258225fb5a4d74d544d79b9bd585f9
---
M modules/ext.LanguageToolAction.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/LanguageTool
refs/changes/53/222853/1
diff --git a/modules/ext.LanguageToolAction.js
b/modules/ext.LanguageToolAction.js
index c31b81e..e641ee4 100644
--- a/modules/ext.LanguageToolAction.js
+++ b/modules/ext.LanguageToolAction.js
@@ -84,7 +84,7 @@
* @return {NULL} Action was executed
*/
mw.languageToolAction.prototype.send = function () {
-<<<<<<< HEAD
+
var textNodes, model, text, nodeI, node, nodeRange, nodeText,
lang, self;
textNodes = this.extract();
model = ve.init.target.getSurface().getModel();
@@ -192,7 +192,7 @@
// License: "This is free and unencumbered software released into the public
domain.",
// see http://james.padolsey.com/terms-conditions/
mw.languageToolAction.prototype._wordwrap = function(str, width, brk, cut) {
-<<<<<<< HEAD
+
brk = brk || '\n';
width = width || 75;
cut = cut || false;
--
To view, visit https://gerrit.wikimedia.org/r/222853
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8ec5c9d377258225fb5a4d74d544d79b9bd585f9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/LanguageTool
Gerrit-Branch: master
Gerrit-Owner: Ankita-ks <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
