search

muses-code-js / musescodejs

New website powered by Keystone
MIT License
0 stars 1 forks source link

Feature/13 contact us #37

Closed juliana-gru closed 4 years ago

juliana-gru commented 4 years ago

Contact page image

After successfully sending a message: image

laizeferraz commented 4 years ago

Hi Ju, I checked the code and is it all good, in my opinion. Don't forget to resolve the conflicts. GitHub won't allow the merge if there are conflicting files. Cheers.

juliana-gru commented 4 years ago

Will do! Thanks La! Btw, for the package.json and yarn.lock, should I keep the master's files or my branch's? I didn't add any dependencies so the package.json should have the same content, but I did update keystone and some dependencies along with it. What did you guys do for your merges?