search

chingu-voyages / v42-geckos-team-19

Add-project-description-here | Voyage-42 | https://chingu.io/ | Twitter: https://twitter.com/ChinguCollabs
4 stars 0 forks source link

Merge merge-test/developmentANDhomepage-body into development #75

Closed Stan-Stani closed 1 year ago

Stan-Stani commented 1 year ago

…epage-body

Stan-Stani commented 1 year ago

I'm not sure why it says all those conflicts exist because when I check in git command line it's literally just (ignoring package-lock) image

Stan-Stani commented 1 year ago

So we should just be able to accept incoming, then npm install (which will also resolve package-lock conflicts) and be good to go!