Resolve some merge conflicts

mui · Sep 1, 2021 · 14e3341 · 14e3341
1 parent f5df95d
commit 14e3341
Show file tree

Hide file tree

Showing 13 changed files with 45 additions and 45 deletions.
diff --git a/docs/src/pages/components/masonry/BasicMasonry.js b/docs/src/pages/components/masonry/BasicMasonry.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 110, 150, 130, 80, 50, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/BasicMasonry.tsx b/docs/src/pages/components/masonry/BasicMasonry.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 110, 150, 130, 80, 50, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/FixedColumns.js b/docs/src/pages/components/masonry/FixedColumns.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/FixedColumns.tsx b/docs/src/pages/components/masonry/FixedColumns.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/FixedSpacing.js b/docs/src/pages/components/masonry/FixedSpacing.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/FixedSpacing.tsx b/docs/src/pages/components/masonry/FixedSpacing.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/ImageMasonry.js b/docs/src/pages/components/masonry/ImageMasonry.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import Masonry from '@mui/lab/Masonry';
 
 export default function ImageMasonry() {
   return (

diff --git a/docs/src/pages/components/masonry/ImageMasonry.tsx b/docs/src/pages/components/masonry/ImageMasonry.tsx
@@ -1,6 +1,6 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import Masonry from '@mui/lab/Masonry';
 
 export default function ImageMasonry() {
   return (

diff --git a/docs/src/pages/components/masonry/ResponsiveColumns.js b/docs/src/pages/components/masonry/ResponsiveColumns.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/ResponsiveColumns.tsx b/docs/src/pages/components/masonry/ResponsiveColumns.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/ResponsiveSpacing.js b/docs/src/pages/components/masonry/ResponsiveSpacing.js
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/docs/src/pages/components/masonry/ResponsiveSpacing.tsx b/docs/src/pages/components/masonry/ResponsiveSpacing.tsx
@@ -1,8 +1,8 @@
 import * as React from 'react';
-import Box from '@material-ui/core/Box';
-import { styled } from '@material-ui/core/styles';
-import Paper from '@material-ui/core/Paper';
-import Masonry from '@material-ui/lab/Masonry';
+import Box from '@mui/material/Box';
+import { styled } from '@mui/material/styles';
+import Paper from '@mui/material/Paper';
+import Masonry from '@mui/lab/Masonry';
 
 const heights = [150, 30, 90, 70, 90, 100, 150, 30, 50, 80];
 

diff --git a/packages/material-ui-lab/src/Masonry/Masonry.test.js b/packages/material-ui-lab/src/Masonry/Masonry.test.js
@@ -1,6 +1,6 @@
 import * as React from 'react';
 import { createClientRender, describeConformance } from 'test/utils';
-import Masonry, { masonryClasses as classes } from '@material-ui/lab/Masonry';
+import Masonry, { masonryClasses as classes } from '@mui/lab/Masonry';
 
 describe('<Masonry />', () => {
   const render = createClientRender();