bump the master version to v1.11.0-dev

build/version.go

@@ -31,7 +31,7 @@ func buildType() string {
 }
 
 // BuildVersion is the local build version, set by build system
-const BuildVersion = "1.9.0"
+const BuildVersion = "1.11.0-dev"
 
 func UserVersion() string {
 	if os.Getenv("LOTUS_VERSION_IGNORE_COMMIT") == "1" {

scripts/publish-release.sh

@@ -39,11 +39,7 @@ if [ "${RELEASE_ID}" = "null" ]; then
   RELEASE_DATA="{
     \"tag_name\": \"${CIRCLE_TAG}\",
     \"target_commitish\": \"${CIRCLE_SHA1}\",
-<<<<<<< HEAD
-    \"discussion_category_name\": \"announcement\",
-=======
     ${COND_CREATE_DISCUSSION}
->>>>>>> master
     \"name\": \"${CIRCLE_TAG}\",
     \"body\": \"\",
     \"prerelease\": ${PRERELEASE}