Resolve master merge conflicts.

2023-01-24 10:56:28 -08:00
parent 41c63cbfe9 162aeca7c8
commit c6087574be
21 changed files with 348 additions and 43177 deletions
--- a/client/src/pages/profile/profile.page.jsx
+++ b/client/src/pages/profile/profile.page.jsx
@@ -1,3 +1,4 @@
+import { Row } from "antd";
 import React from "react";
 import ProfileMyComponent from "../../components/profile-my/profile-my.component";
 import ProfileShopsContainer from "../../components/profile-shops/profile-shops.container";
@@ -5,8 +6,10 @@ import ProfileShopsContainer from "../../components/profile-shops/profile-shops.
 export default function ProfilePage() {
  return (
    <div>
-      <ProfileMyComponent />
-      <ProfileShopsContainer />
+      <Row gutter={[16, 16]}>
+        <ProfileMyComponent />
+        <ProfileShopsContainer />
+      </Row>
    </div>
  );
 }