remove whitespace from conflict

samgst-amazon · samgst-amazon · commit ef6ec8598f0a · 2024-12-11T15:21:24.000-08:00
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationStateUtils.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/notifications/NotificationStateUtils.kt
@@ -34,8 +34,6 @@ data class NotificationDismissalConfiguration(
     var dismissedNotifications: MutableSet<DismissedNotification> = mutableSetOf(),
 )
 
-
-
 @Service
 @State(name = "notificationDismissals", storages = [Storage("aws.xml", roamingType = RoamingType.DISABLED)])
 class NotificationDismissalState : PersistentStateComponent<NotificationDismissalConfiguration> {

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ data class NotificationDismissalConfiguration(`
`34`	`34`	`var dismissedNotifications: MutableSet<DismissedNotification> = mutableSetOf(),`
`35`	`35`	`)`
`36`	`36`
`37`		`-`
`38`		`-`
`39`	`37`	`@Service`
`40`	`38`	`@State(name = "notificationDismissals", storages = [Storage("aws.xml", roamingType = RoamingType.DISABLED)])`
`41`	`39`	`class NotificationDismissalState : PersistentStateComponent<NotificationDismissalConfiguration> {`