|
@@ -71,8 +71,13 @@ steps:
|
71
|
71
|
- echo "copy docs to ${DRONE_REPO_NAME}"; cp -r ../docs/* .
|
72
|
72
|
- ls
|
73
|
73
|
- echo "# Documentation" >> ./README.md
|
|
74
|
+<<<<<<< HEAD
|
74
|
75
|
- echo "https://gitea.frontblock.me/fw-docs/${DRONE_REPO_NAME}" >> ./README.md
|
75
|
76
|
- echo "### Version" >> ./README.md
|
|
77
|
+=======
|
|
78
|
+ - echo globals.md >> ./README.md
|
|
79
|
+ - echo "# Version" >> ./README.md
|
|
80
|
+>>>>>>> b76ff76b2137db313c58c2e6bf8be64ccbbb1b8d
|
76
|
81
|
- echo "${DRONE_TAG}" >> ./README.md
|
77
|
82
|
- echo "" >> ./README.md
|
78
|
83
|
- cat globals.md >> ./README.md
|