search

patternfly / react-topology

MIT License
8 stars 17 forks source link

chore(package.json) Fix V6 package.json file #199

Closed jeff-phillips-18 closed 1 month ago

jeff-phillips-18 commented 1 month ago

The package.json file in v6 currently has merge conflict markers, this fix removes them

nicolethoen commented 1 month ago

I think the pr-preview action needs to be updated where ever there is a reference to origin/main (like on this line) to be origin/v6.

jeff-phillips-18 commented 1 month ago

I think the pr-preview action needs to be updated where ever there is a reference to origin/main (like on this line) to be origin/v6.

@nicolethoen I've updated pr-preview.yml for this PR but it doesn't see to be using it.

nicolethoen commented 1 month ago

ah - true - it wont run the new actions til the old ones are merged. You or I could make the changes to the gh action directly in the v6 branch.

jeff-phillips-18 commented 1 month ago

@nicolethoen I think we just merge this PR. Then we can test the next, this PR only fixes a merge issue.