Skip to content

Commit b05ed08

Browse files
committed
fix(nav): Rename ContentHeader to PageHeader
1 parent 679c698 commit b05ed08

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,15 @@ exports[`PageHeader component should render 1`] = `
6666
>
6767
<h1
6868
class="pf-v6-c-content--h1 pf-v6-u-mb-sm"
69+
<<<<<<< HEAD
6970
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
7071
data-ouia-component-id="PageHeader-title"
7172
=======
7273
data-ouia-component-id="ContentHeader-title"
7374
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
75+
=======
76+
data-ouia-component-id="PageHeader-title"
77+
>>>>>>> c9d5ca0 (fix(nav): Rename ContentHeader to PageHeader)
7478
data-ouia-component-type="PF6/Content"
7579
data-ouia-safe="true"
7680
data-pf-content="true"
@@ -84,20 +88,28 @@ exports[`PageHeader component should render 1`] = `
8488
</div>
8589
<p
8690
class="pf-v6-c-content--p"
91+
<<<<<<< HEAD
8792
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
8893
data-ouia-component-id="PageHeader-subtitle"
8994
=======
9095
data-ouia-component-id="ContentHeader-subtitle"
9196
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
97+
=======
98+
data-ouia-component-id="PageHeader-subtitle"
99+
>>>>>>> c9d5ca0 (fix(nav): Rename ContentHeader to PageHeader)
92100
data-ouia-component-type="PF6/Content"
93101
data-ouia-safe="true"
94102
data-pf-content="true"
95103
>
104+
<<<<<<< HEAD
96105
<<<<<<< HEAD:packages/module/src/PageHeader/__snapshots__/PageHeader.test.tsx.snap
97106
This is a subtitle for your page header
98107
=======
99108
This is a subtitle for your content header
100109
>>>>>>> f902535 (fix(pf6): Rebase to the latest main (#259)):packages/module/src/ContentHeader/__snapshots__/ContentHeader.test.tsx.snap
110+
=======
111+
This is a subtitle for your page header
112+
>>>>>>> c9d5ca0 (fix(nav): Rename ContentHeader to PageHeader)
101113
</p>
102114
</div>
103115
</div>

0 commit comments

Comments
 (0)