Resolve merge conflicts

Author: SttApollo

legacy/core/src/main/java/com/fsck/k9/CoreResourceProvider.kt

@@ -24,9 +24,6 @@ interface CoreResourceProvider {
 
     fun searchUnifiedFoldersTitle(): String
     fun searchUnifiedFoldersDetail(): String
-
-    val iconPushNotification: Int
-
     fun pushNotificationText(notificationState: PushNotificationState): String
     fun pushNotificationInfoText(): String
     fun pushNotificationGrantAlarmPermissionText(): String