fixing mergify conflicts

elastic · Sep 7, 2021 · ed2c06c · ed2c06c
1 parent ff62211
commit ed2c06c
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 20 deletions.
diff --git a/x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml b/x-pack/filebeat/module/threatintel/abuseurl/ingest/pipeline.yml
@@ -96,15 +96,6 @@ processors:
  }
  }
  }
-<<<<<<< HEAD
- }
- handleMap(ctx);
-- remove:
- field:
- - threatintel.abuseurl.date_added
- - message
- ignore_missing: true
-=======
  handleMap(ctx);
  - remove:
  field:
@@ -113,7 +104,6 @@ processors:
  - threatintel.abuseurl.host
  - message
  ignore_missing: true
->>>>>>> 4be26943b4 ([Filebeat] Threatintel compatibility updates (#27323))
 on_failure:
  - set:
  field: error.message

diff --git a/x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml b/x-pack/filebeat/module/threatintel/anomali/ingest/pipeline.yml
@@ -139,23 +139,13 @@ processors:
  }
  }
  }
-<<<<<<< HEAD
- }
- handleMap(ctx);
-- remove:
- field:
- - threatintel.anomali.created
- - message
- ignore_missing: true
-=======
  handleMap(ctx);
  - remove:
  field:
  - threatintel.anomali.created
  - message
  - _tmp
  ignore_missing: true
->>>>>>> 4be26943b4 ([Filebeat] Threatintel compatibility updates (#27323))
 on_failure:
  - set:
  field: error.message