Update linux_auditd_service_stop.yml

tccontre · web-flow · commit b1032d7ff72d · 2025-02-21T10:31:34.000+01:00
diff --git a/data_sources/linux_auditd_service_stop.yml b/data_sources/linux_auditd_service_stop.yml
@@ -1,12 +1,7 @@
 name: Linux Auditd Service Stop
 id: 0643483c-bc62-455c-8d6e-1630e5f0e00d
-<<<<<<< HEAD
 version: 2
 date: '2025-02-20'
-=======
-version: 1
-date: '2024-09-24'
->>>>>>> 6f88528e2849855c588650d7b6bd0396b1cc384b
 author: Teoderick Contreras, Splunk
 description: Data source object for Linux Auditd Service Stop Type
 source: auditd
