Auto stash before rebase of "feat/#48" onto "main"

package.json

@@ -8,7 +8,10 @@
     "@testing-library/user-event": "^13.5.0",
     "@types/jest": "^27.5.2",
     "ajv-keywords": "^5.1.0",
+<<<<<<< Updated upstream
     "axios": "^1.7.3",
+=======
+>>>>>>> Stashed changes
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",
     "express": "^4.19.2",

src/App.tsx

@@ -65,4 +65,4 @@ function App() {
   );
 }
 
-export default App;
+export default App;

src/components/AddGroup/AddGroupMembername/Styles.ts

@@ -27,6 +27,8 @@ export const Fly = styled(I.Fly)`
 `;
 
 export const Text = styled.p`
+<<<<<<< Updated upstream
+=======
   font-size: 0.7rem;
   color: ${({ theme }) => theme.colors.primary};
   position: relative;
@@ -52,6 +54,20 @@ export const ListLayout = styled.div`
   height: 300px;
 `;
 
+<<<<<<< Updated upstream
+export const ListLayout = styled.div`
+  position: relative;
+  width: 350px;
+  height: 400px;
+`;
+
+export const File = styled(I.File)`
+  position: absolute;
+  justify-content: center;
+  align-items: center;
+  width: 100%;
+  height: 100%;
+=======
 export const NextArrow = styled(I.NextArrowCircle)`
   position: absolute;
   bottom: calc(25% - 12px - 36.5px);
@@ -60,4 +76,5 @@ export const NextArrow = styled(I.NextArrowCircle)`
   width: 9%; /* Adjust width as needed */
   height: 20%;
   cursor: pointer;
+>>>>>>> Stashed changes
 `;