mmandelb2201 / finance-bot

SSW345 Bot
1 stars 1 forks source link

Mikayla #23

Closed verdetea22 closed 2 years ago

verdetea22 commented 2 years ago

fixing merge conflicts, was on package-lock.json, home.jsx, app.js. this will write over the 4 lines of code we have on home.jsx on the main branch