fix git conflict

Signed-off-by: lance6716 <[email protected]>
pingcap · Feb 23, 2024 · df7de98 · df7de98
1 parent a053348
commit df7de98
Showing 1 changed file with 1 addition and 9 deletions.
diff --git a/scripts/check.sh b/scripts/check.sh
@@ -20,15 +20,7 @@ check-protos-compatible() {
     export PATH=$GOPATH/bin:$PATH
 
     if [ ! -f "$GOPATH/bin/protolock" ]; then
-<<<<<<< HEAD
-	    GO111MODULE=off go install github.com/nilslice/protolock/cmd/[email protected]
-||||||| a554af8
-        GO111MODULE=off go get github.com/nilslice/protolock/cmd/protolock
-	    GO111MODULE=off go install github.com/nilslice/protolock/cmd/protolock
-=======
-        GO111MODULE=off go get github.com/nilslice/protolock/cmd/protolock
-        GO111MODULE=off go install github.com/nilslice/protolock/cmd/protolock
->>>>>>> 881fcbf5bc41a492d77db7a27f07ffe5088df6dc
+        GO111MODULE=off go install github.com/nilslice/protolock/cmd/[email protected]
 	fi
 
     if protolock status -lockdir=scripts -protoroot=proto; then