Solving merge conflicts

This commit is contained in:
Vladyslav Matsiiako
2022-12-25 17:28:55 -05:00
parent bec139315f
commit f020b553b3
+2 -1
View File
@@ -354,6 +354,7 @@ export default function SignUp() {
Make sure to check your spam inbox. Make sure to check your spam inbox.
</p> </p>
</div> </div>
</div>
); );
// Step 3 of the signup process (enter the rest of the impformation) // Step 3 of the signup process (enter the rest of the impformation)
@@ -511,6 +512,7 @@ export default function SignUp() {
It contains your Secret Key which we cannot access or recover for you if It contains your Secret Key which we cannot access or recover for you if
you lose it. you lose it.
</div> </div>
<div
className="text-l mt-4 text-lg text-gray-400 hover:text-gray-300 duration-200 bg-white/5 px-8 hover:bg-white/10 py-3 rounded-md cursor-pointer" className="text-l mt-4 text-lg text-gray-400 hover:text-gray-300 duration-200 bg-white/5 px-8 hover:bg-white/10 py-3 rounded-md cursor-pointer"
onClick={() => { onClick={() => {
if (localStorage.getItem("projectData.id")) { if (localStorage.getItem("projectData.id")) {
@@ -521,7 +523,6 @@ export default function SignUp() {
}} }}
> >
Later Later
</div> */}
</div> </div>
</div> </div>
); );