diff --git a/README.md b/README.md index bc30f33..232d59f 100644 --- a/README.md +++ b/README.md @@ -1,12 +1,4 @@ -<<<<<<< HEAD -# At this moment deprecated in favor of pydocs. - -This project is based on Gitbook, new docs are based on Github pages. - -# Introduction -======= # run locally ->>>>>>> publish ``` brew install hugo @@ -15,19 +7,9 @@ hugo serve # Workflow -<<<<<<< HEAD -* [Products](products.md) -* [Getting Started](getting-started/introduction.md) -* [Pymakr](pymakr-plugin/installation/) -* [Tutorials](tutorials-and-examples/introduction.md) -* [API Documentation](firmware-and-api-reference/introduction.md) -* [Product Info](product-info-datasheets/introduction.md) -* [Pybytes](pybytes/introduction.md) -======= - Make PR using Master branch - PR get merged on master - Then merge publish with master ->>>>>>> publish ``` git commit -m "section: commit message" @@ -55,5 +37,5 @@ git push origin publish wget -o 404.txt -r --spider http://localhost:1313 ``` -A webhook has been installed on the publish branch to: -- https://publish.d1rmdw1xyxqk1e.amplifyapp.com/ +A webhook has been installed on the publish branch to +https://publish.d20i0wkqbblkur.amplifyapp.com/