Merge conflict - Githubissues

UjjwolMagar09 / VROOM-V2

0 stars 4 forks source link

Merge conflict #12

Open SirishTandukar opened 3 months ago

SirishTandukar commented 3 months ago

conflict is arising while merging the footer there is no footer in the home page and trying to solve footer comes in every page. Screenshot 2024-05-19 175900

UjjwolMagar09 commented 3 months ago

merge conflict resolved