bump

2019-09-22 15:50:54 +02:00
parent c9b6cc4872 b76ff76b21
commit 206df1cae6
2 changed files with 2 additions and 7 deletions
@@ -71,13 +71,8 @@ steps:
  - echo "copy docs to ${DRONE_REPO_NAME}"; cp -r ../docs/* .
  - ls
  - echo "# Documentation" >> ./README.md
-<<<<<<< HEAD
  - echo "https://gitea.frontblock.me/fw-docs/${DRONE_REPO_NAME}" >> ./README.md
-  - echo "### Version" >> ./README.md
-=======
-  - echo globals.md >> ./README.md
-  - echo "# Version" >> ./README.md
->>>>>>> b76ff76b2137db313c58c2e6bf8be64ccbbb1b8d
+  - echo "## Version" >> ./README.md
  - echo "${DRONE_TAG}" >> ./README.md
  - echo "" >> ./README.md
  - cat globals.md >> ./README.md