merge conflicts fixed

This commit is contained in:
Martin Stransky 2023-01-13 11:26:46 +01:00
commit c33aba22e6
3 changed files with 7 additions and 2 deletions

2
.gitignore vendored
View File

@ -551,3 +551,5 @@ firefox-3.6.4.source.tar.bz2
/firefox-langpacks-108.0-20221214.tar.xz
/firefox-108.0.1.source.tar.xz
/firefox-langpacks-108.0.1-20221218.tar.xz
/firefox-108.0.2.source.tar.xz
/firefox-langpacks-108.0.2-20230112.tar.xz

View File

@ -1079,6 +1079,9 @@ fi
* Wed Jan 11 2023 Martin Stransky <stransky@redhat.com>- 109.0-1
- Update to 109.0
* Thu Jan 12 2023 Jan Horak <jhorak@redhat.com> - 108.0.2-1
- Update to 108.0.2
* Mon Jan 09 2023 Kalev Lember <klember@redhat.com> - 108.0.1-4
- Drop conditionals for F35

View File

@ -1,4 +1,4 @@
SHA512 (cbindgen-vendor.tar.xz) = 0d45c1decfd7aaee853748745c9f5a907c0c6a0cf809c2387aac1cdcf680b0844b1ef4d05148e0527de4ff6e4d4666110bea317bd00b7d73a1210eb58a815563
SHA512 (mochitest-python.tar.gz) = e0a2c569dafe013b6a4c073516388549a8f398d8aa4538a3bc69dcda44737a3a3cf070285e9fa040a15d7a62446665c6158d42a1b6dc3e8d7f4680bc2ef17a16
SHA512 (firefox-108.0.1.source.tar.xz) = e6219ed6324422ec293ed96868738e056582bb9f7fb82e59362541f3465c6ebca806d26ecd801156b074c3675bd5a22507b1f1fa53eebf82b7dd35f2b1ff0625
SHA512 (firefox-langpacks-108.0.1-20221218.tar.xz) = ac9766a4eb419ba04a138cbd3a4f44dac9d83a4c2680f5b29f8b2da2ac9659cc0b1706b974e15563b2aaed371a11a999f5f11172610d60e4ebe6dcb860f1b1f2
SHA512 (firefox-108.0.2.source.tar.xz) = f856ef034fa4a526e19968aed092c9ee99e124d2d271ec1c1bbd091d9a03e23293d69c7a9ae17c43258cde7e73c294534b471e36441e576377854f607c9bfa3a
SHA512 (firefox-langpacks-108.0.2-20230112.tar.xz) = dfe1273fe3c29e737623915c10a900f370306a9af00c92b0479f2c779056823b99dff0ff94a779f8a8fa14c4d85e27813da297bfc5439802c8f1b2e5e31431b5