Resolve merge conflicts with micromata/develop 2

micromata · Aug 21, 2023 · 2d9255f · 2d9255f
1 parent 2047b40
commit 2d9255f
Showing 1 changed file with 0 additions and 2 deletions.
diff --git a/...ctforge-business/src/main/kotlin/org/projectforge/birthdaybutler/BirthdayButlerService.kt b/...ctforge-business/src/main/kotlin/org/projectforge/birthdaybutler/BirthdayButlerService.kt
@@ -240,8 +240,6 @@ class BirthdayButlerService {
     val foundUsers = mutableListOf<AddressDO>()
     addressList.forEach { address ->
       if (activeUsers.any { user ->
-          address.firstName?.trim().equals(user.firstname?.trim(), ignoreCase = true) &&
-              address.name?.trim().equals(user.lastname?.trim(), ignoreCase = true)
           address.firstName?.trim()?.equals(user.firstname?.trim(), ignoreCase = true) == true &&
               address.name?.trim()?.equals(user.lastname?.trim(), ignoreCase = true) == true
         }) {