search

uob-group-10-mynt / mynt-finance-banking-app

A prototype banking app for Mynt, Kenya.
3 stars 0 forks source link

[feat]: Add navigation drawer with new customised components #85

Closed theCyberExorcist closed 3 days ago

theCyberExorcist commented 1 week ago

I'll fix the conflict first and then pushed another commit

koreanMike513 commented 3 days ago

have you pulled the dev branch before you push it? otherwise you can have conflicts?

theCyberExorcist commented 3 days ago

have you pulled the dev branch before you push it? otherwise you can have conflicts?

Yes I had as you can see that the latest commit is [Merge branch 'dev' into feature/frontend-navigation]

koreanMike513 commented 3 days ago

Have you solved the git conflicts then?

theCyberExorcist commented 3 days ago

Have you solved the git conflicts then?

Yes I did