fix: resolve conflict

calblueprint · Mar 16, 2024 · d2fe40d · d2fe40d
1 parent 8c69ea7
commit d2fe40d
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/src/app/dummyPage/page.tsx b/src/app/dummyPage/page.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import EmailPopup from '../../components/userComponents/emailPopup/page';
+
+/**
+ * @returns email popup
+ */
+export default function Home() {
+  return (
+    <EmailPopup
+    />
+  );
+}