fixed conflict

ita-social-projects · Dec 5, 2024 · 2c875f2 · 2c875f2
1 parent ac5afa8
commit 2c875f2
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/tests/unit/pages/edit-profile/EditProfile.spec.jsx b/tests/unit/pages/edit-profile/EditProfile.spec.jsx
@@ -71,7 +71,6 @@ const userMock = {
   }
 }
 
-<<<<<<< HEAD
 const mockData = {
   firstName: '',
   lastName: '',
@@ -83,15 +82,13 @@ const mockData = {
     videoLink: '',
   },
 };
-=======
 vi.mock('react-router-dom', async (importOriginal) => {
   const actual = await importOriginal();
   return {
     ...actual,
     useBlocker: vi.fn(),
   };
 });
->>>>>>> 186c8d3c (changed bug of unsaved changing if leave without changes)
 
 vi.mock('~/hooks/use-confirm', () => ({
   default: () => ({ checkConfirmation: () => true })