search

mse150s20 / p2-kinetics

1 stars 22 forks source link

Edited README #43

Closed carmenwu1 closed 4 years ago

carmenwu1 commented 4 years ago

Okay, it should be fixed now. I just combined the contributor files together and made sure there were no duplicates

carmenwu1 commented 4 years ago

Just fixed my contributors so let's hope that fixes everything.

jennyfothergill commented 4 years ago

I'm reopening this because your other changes are good! just do git pull class master, fix the merge conflicts (vim, fix, add, commit), and then git push!

carmenwu1 commented 4 years ago

No more branch conflicts!!!

jennyfothergill commented 4 years ago

Nice! do git push and then those changes will show up here C:

carmenwu1 commented 4 years ago

Just pushed it.