[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Upstream whitespace variant

2017-01-03 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/329721 )

Change subject: Upstream whitespace variant
..


Upstream whitespace variant

Change-Id: If80e878fa793fce8c03c06e3ab8dcf190a806c10
---
M templates/CRM/Contact/Page/DedupeFind.tpl
1 file changed, 2 insertions(+), 2 deletions(-)

Approvals:
  jenkins-bot: Verified
  Ejegg: Looks good to me, approved



diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl 
b/templates/CRM/Contact/Page/DedupeFind.tpl
index 2811f79..09f73c3 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -156,8 +156,8 @@
   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q="`$urlQuery`&action=map" a=1}{/capture}
 {ts}Batch Merge Selected 
Duplicates{/ts}
 
-{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q=$urlQuery a=1}{/capture}
- {ts}Batch Merge All Duplicates{/ts}
+   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q=$urlQuery 
a=1}{/capture}
+{ts}Batch Merge All Duplicates{/ts}
 
 {ts}Flip Selected Duplicates{/ts}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: If80e878fa793fce8c03c06e3ab8dcf190a806c10
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 
Gerrit-Reviewer: Awight 
Gerrit-Reviewer: Ejegg 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] wikimedia...civicrm[master]: Upstream whitespace variant

2016-12-30 Thread Eileen (Code Review) 
Eileen has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/329721 )

Change subject: Upstream whitespace variant
..

Upstream whitespace variant

Change-Id: If80e878fa793fce8c03c06e3ab8dcf190a806c10
---
M templates/CRM/Contact/Page/DedupeFind.tpl
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/civicrm 
refs/changes/21/329721/1

diff --git a/templates/CRM/Contact/Page/DedupeFind.tpl 
b/templates/CRM/Contact/Page/DedupeFind.tpl
index 2811f79..09f73c3 100644
--- a/templates/CRM/Contact/Page/DedupeFind.tpl
+++ b/templates/CRM/Contact/Page/DedupeFind.tpl
@@ -156,8 +156,8 @@
   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q="`$urlQuery`&action=map" a=1}{/capture}
 {ts}Batch Merge Selected 
Duplicates{/ts}
 
-{capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" 
q=$urlQuery a=1}{/capture}
- {ts}Batch Merge All Duplicates{/ts}
+   {capture assign=backURL}{crmURL p="civicrm/contact/dedupemerge" q=$urlQuery 
a=1}{/capture}
+{ts}Batch Merge All Duplicates{/ts}
 
 {ts}Flip Selected Duplicates{/ts}
 

-- 
To view, visit https://gerrit.wikimedia.org/r/329721
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: If80e878fa793fce8c03c06e3ab8dcf190a806c10
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/civicrm
Gerrit-Branch: master
Gerrit-Owner: Eileen 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits