Skip to content

Commit 1994e7c

Browse files
committed
docs: fix bad merge in release notes
1 parent bd44e8e commit 1994e7c

File tree

1 file changed

+36
-38
lines changed

1 file changed

+36
-38
lines changed

docs/docs-content/release-notes/release-notes.md

Lines changed: 36 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,42 @@ Check out the [CLI Tools](/downloads/cli-tools/) page to find the compatible ver
7070

7171
### Docs and Education
7272

73+
#### Pack Notes
74+
75+
<<<<<<< HEAD
76+
77+
#### OS
78+
79+
| Pack Name | New Version |
80+
| --------- | ----------- |
81+
82+
#### Kubernetes
83+
84+
| Pack Name | New Version |
85+
| --------- | ----------- |
86+
87+
#### CNI
88+
89+
| Pack Name | New Version |
90+
| --------- | ----------- |
91+
92+
#### CSI
93+
94+
| Pack Name | New Version |
95+
| --------- | ----------- |
96+
97+
#### Add-on Packs
98+
99+
| Pack Name | New Version |
100+
| --------- | ----------- |
101+
102+
#### FIPS Packs
103+
104+
| Pack Name | New Version |
105+
| --------- | ----------- |
106+
107+
#### Deprecations and Removals
108+
73109
## January 30, 2026 - Release 4.8.25
74110

75111
### Breaking Changes
@@ -156,42 +192,6 @@ The following components have been updated for Palette version 4.8.6 - 4.8.24.
156192

157193
#### Pack Notes
158194

159-
<<<<<<< HEAD
160-
161-
#### OS
162-
163-
| Pack Name | New Version |
164-
| --------- | ----------- |
165-
166-
#### Kubernetes
167-
168-
| Pack Name | New Version |
169-
| --------- | ----------- |
170-
171-
#### CNI
172-
173-
| Pack Name | New Version |
174-
| --------- | ----------- |
175-
176-
#### CSI
177-
178-
| Pack Name | New Version |
179-
| --------- | ----------- |
180-
181-
#### Add-on Packs
182-
183-
| Pack Name | New Version |
184-
| --------- | ----------- |
185-
186-
#### FIPS Packs
187-
188-
| Pack Name | New Version |
189-
| --------- | ----------- |
190-
191-
#### Deprecations and Removals
192-
193-
=======
194-
195195
<!-- https://spectrocloud.atlassian.net/browse/PAC-3587 -->
196196
<!-- prettier-ignore-start -->
197197

@@ -221,8 +221,6 @@ The following components have been updated for Palette version 4.8.6 - 4.8.24.
221221
| Prometheus Operator | Add-on | :white_check_mark: | :x: | 80.13.3 |
222222
| Vault | Add-on | :white_check_mark: | :x: | 0.32.0 |
223223

224-
> > > > > > > master
225-
226224
## January 23, 2026 - Component Updates {#component-updates-2026-04}
227225

228226
The following components have been updated for Palette version 4.8.6 - 4.8.24.

0 commit comments

Comments
 (0)