ZBUG-2362: Upgraded Apache to 2.4.51

Zimbra · Sep 12, 2022 · 1f67f3b · 1f67f3b
1 parent f4e14d2
commit 1f67f3b
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec b/zimbra/spell-components/zimbra-spell-components/rpm/SPECS/spell-components.spec
@@ -11,7 +11,7 @@ Requires:           zimbra-aspell-es >= 1.11.2-1zimbra8.7b2ZAPPEND, zimbra-aspel
 Requires:           zimbra-aspell-hi >= 0.02.0-1zimbra8.7b2ZAPPEND
 Requires:           zimbra-aspell-hu >= 0.99.4.2.0-1zimbra8.7b2ZAPPEND
 Requires:           zimbra-aspell-it >= 2.2.20050523.0-1zimbra8.7b2ZAPPEND
-Requires:           zimbra-aspell-nl >= >= 0.50.2-1zimbra8.7b2ZAPPEND
+Requires:           zimbra-aspell-nl >= 0.50.2-1zimbra8.7b2ZAPPEND
 Requires:           zimbra-aspell-pl >= 6.0.20061121.0-1zimbra8.7b2ZAPPEND
 Requires:           zimbra-aspell-pt-br >= 20090702.0-1zimbra8.7b2ZAPPEND
 Requires:           zimbra-aspell-ru >= 0.99f7.1-1zimbra8.7b2ZAPPEND, zimbra-aspell-sv >= 0.51.0-1zimbra8.7b2ZAPPEND
@@ -28,10 +28,13 @@ Zimbra spell components pulls in all the packages used by
 zimbra-spell
 
 %changelog
+<<<<<<< 2486a3ebd58f761540ccadf3062dbee5a7de2c0f
 * Tue Mar 15 2022 Zimbra Packaging Services <[email protected]> - 2.0.9
 - Fix ZCS-11149, Upgraded Apache to 2.4.53
 * Mon Feb 14 2022 Zimbra Packaging Services <[email protected]> - 2.0.8
 - Fix ZBUG-2498, Update PHP to 7.4.27
+=======
+>>>>>>> ZBUG-2362: Upgraded Apache to 2.4.51
 * Tue Jan 24 2022 Zimbra Packaging Services <[email protected]> - 2.0.7
 - Fix ZBUG-2145, Added Catalan dictionary
 * Tue Oct 19 2021 Zimbra Packaging Services <[email protected]> - 2.0.6