search

freeCodeCampLondon / FCCLND

Portal for FCC London Campers
https://FreeCodeCampLondon.github.io/FCCLND/
MIT License
32 stars 16 forks source link

Campers placeholder fix #50

Closed artitudinale1 closed 8 years ago

artitudinale1 commented 8 years ago

closes #48

chris-alexander commented 8 years ago

I think you need to do this, because it is re-committing the previous PRs for some reason:

git checkout master
git pull upstream master --rebase
git checkout fix/campers-placeholders
git rebase master
git push origin -f
artitudinale1 commented 8 years ago

This should be ok to merge. I have trouble resolve conflict with other one