search

nhsuk / nhsuk-prototype-kit-version-one

NHSUK Prototype Kit
https://nhsuk-prototype-kit.herokuapp.com/
MIT License
2 stars 3 forks source link

[NDPE-63] Prepare master for consumption by other teams #8

Closed paul-mitchell-bjss closed 7 years ago

paul-mitchell-bjss commented 7 years ago

This commit combines the mvp-alpha, embedded-documentation and other branches to prepare master for consumption by other teams. Code and templates strictly related to the MVP prototype have been removed.

I've also removed package-lock.json from the repo, perhaps temporarily. I'm not sure its presence is helping and it does have the potential to cause merge conflicts. If teams consuming the kit want to commit the file, that is their choice.

stevenadams commented 7 years ago

Hi Paul, I'll need to get time to review this properly and how it might conflict with the work I am doing on pulling in the frontend-library. Leave it with me :)