projects
/
civicrm-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge pull request #15155 from eileenmcnaughton/merge_perm
[civicrm-core.git]
/
CRM
/
Core
/
Permission.php
diff --git
a/CRM/Core/Permission.php
b/CRM/Core/Permission.php
index 9f74f16ee8dfff64506a06cf205cc243797d2786..0e2a3c16af880a62fa6432171c3e4d93d45fb205 100644
(file)
--- a/
CRM/Core/Permission.php
+++ b/
CRM/Core/Permission.php
@@
-1179,6
+1179,10
@@
class CRM_Core_Permission {
'edit all events',
],
];
+ // Exception refers to dedupe_exception.
+ $permissions['exception'] = [
+ 'default' => ['merge duplicate contacts'],
+ ];
// Loc block is only used for events
$permissions['loc_block'] = $permissions['event'];