search

devsync23 / haves-and-needs-service

0 stars 0 forks source link

kun/10-validateRegister #19

Closed gxyxxuekun closed 6 months ago

therealjustinbiele commented 6 months ago

Looks like we have a merge conflict; andrew had some work merged in with the same file name user.middleware.ts. Totally cool, just make sure his changes are included in your merge conflict resolution

gxyxxuekun commented 6 months ago

Looks like we have a merge conflict; andrew had some work merged in with the same file name user.middleware.ts. Totally cool, just make sure his changes are included in your merge conflict resolution

Solved the merge conflict. Do I just merge or you need to take a look?