I apparently did not save

chrisronline · chrisronline · commit 01bcc7cd2b4b · 2020-11-25T15:50:01.000-05:00
diff --git a/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts b/x-pack/plugins/monitoring/server/alerts/license_expiration_alert.ts
@@ -16,14 +16,8 @@ import {
   AlertMessageLinkToken,
   AlertInstanceState,
   LegacyAlert,
-<<<<<<< HEAD
 } from './types';
 import { AlertInstance } from '../../../alerts/server';
-=======
-  CommonAlertParams,
-} from '../../common/types/alerts';
-import { AlertExecutorOptions, AlertInstance } from '../../../alerts/server';
->>>>>>> dfa9c75021f... Fix issues with show_license_expiration (#84361)
 import {
   INDEX_ALERTS,
   ALERT_LICENSE_EXPIRATION,
