From f0dafcb961a5a3093acf44296e277b00bfb91dc1 Mon Sep 17 00:00:00 2001
From: Jennifer Wang <jiayingw703@gmail.com>
Date: Mon, 24 Jun 2024 21:15:23 -0400
Subject: [PATCH] address review - resolve one more conflicts - revert 2 new
 line added

---
 .github/workflows/release.yml | 8 --------
 CHANGELOG.md                  | 1 -
 Makefile                      | 1 +
 scripts/version-check.sh      | 1 -
 4 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 6e1f4fd15c3..12ea6e3f90e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -86,11 +86,7 @@ jobs:
     runs-on: ubuntu-latest
     needs: [build]
     env:
-<<<<<<< HEAD
-      PUBLISH: ${{ startsWith(github.ref, 'refs/tags/') }}
-=======
       PUBLISH: ${{ startsWith(inputs.ref || github.ref, 'refs/tags/') }}
->>>>>>> release/v1.27.1
     steps:
       - uses: actions/checkout@v4
         with:
@@ -113,13 +109,9 @@ jobs:
         with:
           name: lotus-macOS-ARM64
           path: darwin_arm64
-<<<<<<< HEAD
-      - uses: ./.github/actions/install-go
-=======
       - uses: ./actions/.github/actions/install-go
         with:
           working-directory: lotus
->>>>>>> release/v1.27.1
       - uses: ipfs/download-ipfs-distribution-action@v1
         with:
           name: kubo
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92027d50d9e..868bf731116 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4217,7 +4217,6 @@ This is a  **highly recommended** but optional Lotus v1.11.1 release that introd
 - Release Template: remove binary validation step ([filecoin-project/lotus#6709](https://github.com/filecoin-project/lotus/pull/6709))
 - Reset of the interop network ([filecoin-project/lotus#6689](https://github.com/filecoin-project/lotus/pull/6689))
 - Update version.go to 1.11.1 ([filecoin-project/lotus#6621](https://github.com/filecoin-project/lotus/pull/6621))
-- chore: pin golanglint-ci to v1.58.2 ([filecoin-project/lotus#12054](https://github.com/filecoin-project/lotus/pull/12054))
 
 ## Contributors
 
diff --git a/Makefile b/Makefile
index d78737d8f8f..1a81ed4f08b 100644
--- a/Makefile
+++ b/Makefile
@@ -383,3 +383,4 @@ docsgen-cli: lotus lotus-miner lotus-worker
 
 print-%:
 	@echo $*=$($*)
+
diff --git a/scripts/version-check.sh b/scripts/version-check.sh
index d41317cb69c..4099c800ebb 100755
--- a/scripts/version-check.sh
+++ b/scripts/version-check.sh
@@ -32,7 +32,6 @@ function validate_lotus_version_matches_tag(){
 
 _lotus_path=$1
 
-
 if [[ "$GITHUB_REF" == refs/tags/* ]]; then
   validate_lotus_version_matches_tag "${_lotus_path}" "${GITHUB_REF#refs/tags/}"
 else