delete test commit

Author: Nebell

.github/workflows/extra.yml

@@ -20,12 +20,6 @@ jobs:
       with:
         go-version: 1.14.4 # optional
     - name: Update Dependency
-<<<<<<< HEAD
-=======
-      if: ${{ ! endsWith(${{ github.ref }}, 'update-dependencies') }}
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
->>>>>>> 103dcd0... Test conditional execution
       run: go get -u ./...
 
     - name: Test

go.mod

@@ -2,7 +2,6 @@ module github.com/wechaty/go-wechaty-getting-started
 
 go 1.14
 
-<<<<<<< HEAD
 require (
 	github.com/golang/protobuf v1.4.2 // indirect
 	github.com/maruel/rs v1.0.0 // indirect
@@ -19,7 +18,3 @@ require (
 	google.golang.org/grpc v1.31.1 // indirect
 	google.golang.org/protobuf v1.25.0 // indirect
 )
-=======
-require github.com/wechaty/go-wechaty v0.1.2
-
->>>>>>> 103dcd0... Test conditional execution