Reconciled fluent-bit fasttrack/3.0 fix with 3.0-dev upgrade

SPECS/fluent-bit/fluent-bit.spec

@@ -1,24 +1,14 @@
 Summary:        Fast and Lightweight Log processor and forwarder for Linux, BSD and OSX
 Name:           fluent-bit
-<<<<<<< HEAD
 Version:        3.1.9
 Release:        1%{?dist}
-=======
-Version:        3.0.6
-Release:        3%{?dist}
->>>>>>> 3988fcb62 (fluent-bit: Address CVE-2024-25431 (#11096))
 License:        Apache-2.0
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://fluentbit.io
 Source0:        https://github.com/fluent/%{name}/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
 Patch0:         CVE-2024-34250.patch
-<<<<<<< HEAD
-=======
-Patch1:         CVE-2024-25629.patch
-Patch2:         CVE-2024-28182.patch
-Patch3:         CVE-2024-25431.patch
->>>>>>> 3988fcb62 (fluent-bit: Address CVE-2024-25431 (#11096))
+Patch1:         CVE-2024-25431.patch
 BuildRequires:  bison
 BuildRequires:  cmake
 BuildRequires:  cyrus-sasl-devel
@@ -93,14 +83,13 @@ Development files for %{name}
 %{_libdir}/fluent-bit/*.so
 
 %changelog
-<<<<<<< HEAD
-* Tue Nov 05 2024 Paul Meyer <[email protected]> - 3.1.9-1
+* Tue Nov 23 2024 Paul Meyer <[email protected]> - 3.1.9-1
 - Update to 3.1.9 to enable Lua filter plugin using system luajit library.
 - Remove patches for CVE-2024-25629 and CVE-2024-28182 as they are fixed in 3.1.9.
-=======
+- [Jon Slobodzian] Reconciled with Fasttrack/3.0 on 11/23, updated Changelog date from 11/5.
+
 * Fri Nov 15 2024 Ankita Pareek <[email protected]> - 3.0.6-3
 - Address CVE-2024-25431
->>>>>>> 3988fcb62 (fluent-bit: Address CVE-2024-25431 (#11096))
 
 * Tue Oct 15 2024 Chris Gunn <[email protected]> - 3.0.6-2
 - CVE-2024-34250