Fix merge conflicts

Author: Paamicky

plugins/inputs/windows_event_log/windows_event_log.go

@@ -40,7 +40,6 @@ type EventConfig struct {
 	LogGroupClass string                     `toml:"log_group_class"`
 	Destination   string                     `toml:"destination"`
 	Retention     int                        `toml:"retention_in_days"`
-  
 }
 type Plugin struct {
 	FileStateFolder string          `toml:"file_state_folder"`

plugins/inputs/windows_event_log/wineventlog/utils.go

@@ -251,4 +251,4 @@ func insertPlaceholderValues(rawMessage string, evtDataValues []Datum) string {
 		sb.WriteString(rawMessage[prevIndex:])
 	}
 	return sb.String()
-}
+}

plugins/inputs/windows_event_log/wineventlog/utils_test.go

@@ -300,4 +300,4 @@ func utf16PtrToString(ptr *uint16) string {
 		utf16Slice = append(utf16Slice, element)
 	}
 	return syscall.UTF16ToString(utf16Slice)
-}
+}