Compare changes
Conflict: This file was modified in both the source and target branches.
Ask someone with write access to resolve it.
+ 15
− 5
@@ -228,7 +228,8 @@ interface BaseEmailInterface {
@@ -254,12 +255,21 @@ interface BaseEmailInterface {