untrobotics / website

Source code to our website (maybe)
MIT License
5 stars 9 forks source link

URW-113 #109

Closed henlegay closed 3 years ago

henlegay commented 3 years ago

Addition of my profile to the Our Web Team page

sebastian-king commented 3 years ago

The anchor tags should stay :)

sebastian-king commented 3 years ago

You will also need to remove the .DS_Store files from the PR. You may want add those to the .gitignore file.

sebastian-king commented 3 years ago

Looks good! You now just need to resolve the merge conflicts as its not possible to merge a PR with conflicts. You just need to merge the develop branch into your feature branch.