search

MLH-Fellowship / prep-project-march-2022

MLH Prep Project for January 2022
https://mlh-prep-march-2022.netlify.app
MIT License
8 stars 17 forks source link

Feature branch 6 #12

Closed Abhishek357 closed 2 years ago

netlify[bot] commented 2 years ago

✅ Deploy Preview for mlh-prep-march-2022 ready!

🔨 Explore the source changes: 2b531c7fc9c0f1800d6db11518a66b3e56bf8463

🔍 Inspect the deploy log: https://app.netlify.com/sites/mlh-prep-march-2022/deploys/62369cb1437bcb0008b82b3b

😎 Browse the preview: https://deploy-preview-12--mlh-prep-march-2022.netlify.app

Siddharth1010 commented 2 years ago

@marcnjaramillo I switched to yarn, but how do we resolve these conflicts?

Abhishek357 commented 2 years ago

@Siddharth1010 @marcnjaramillo I have resolved the merge conflicts. This is ready to merge.