Merge branch 'develop' into feature/feed-component

f-lab-edu · Nov 5, 2024 · 9767b5a · 9767b5a
2 parents 76875cd + 2f3076e
commit 9767b5a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/app/(MainLayout)/components/FeedTextContent/FeedTextContent.module.scss b/src/app/(MainLayout)/components/FeedTextContent/FeedTextContent.module.scss
@@ -3,7 +3,7 @@
 .container {
   max-height: 300px;
   padding: 20px;
-
+  
   .profile_wrapper {
     display: flex;
     justify-content: space-between;

diff --git a/src/components/common/FeedWrapper/FeedWrapper.module.scss b/src/components/common/FeedWrapper/FeedWrapper.module.scss
@@ -28,4 +28,4 @@
     height: 100%;
     overflow: auto;
   }
-}
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ @@
         height: 100%;
         overflow: auto;
       }
-    }
+    }