Skip to content

Commit

Permalink
Revert the conflict with other PR
Browse files Browse the repository at this point in the history
  • Loading branch information
MBilalShafi committed Mar 19, 2024
1 parent 9d1af3e commit 77103e1
Showing 1 changed file with 5 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ To get started, check out [the blog post about the release of MUI X v6](https:/

## Start using the new release

In `package.json`, change the version of the data grid package to `7.x.x`.
In `package.json`, change the version of the data grid package to `next`.

```diff
-"@mui/x-data-grid": "6.x.x",
+"@mui/x-data-grid": "7.x.x",
+"@mui/x-data-grid": "next",
-"@mui/x-data-grid-pro": "6.x.x",
+"@mui/x-data-grid-pro": "7.x.x",
+"@mui/x-data-grid-pro": "next",
-"@mui/x-data-grid-premium": "6.x.x",
+"@mui/x-data-grid-premium": "7.x.x",
+"@mui/x-data-grid-premium": "next",
```

Since v7 is a major release, it contains changes that affect the public API.
Expand All @@ -48,7 +48,7 @@ If you have `@mui/x-license-pro` in the `dependencies` section of your `package.

```diff
-"@mui/x-license-pro": "6.x.x",
+"@mui/x-license": "7.x.x",
+"@mui/x-license": "next",
```

## Run codemods
Expand Down

0 comments on commit 77103e1

Please sign in to comment.