PenaDevops/delve
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

service/dap: Fix build error due to unresolved merge conflict (#2493)

Browse Source 
My local build of delve which apparently pulls in the master branch starting breaking. This is the culprit.

Error:
```
#9 75.27 # github.com/go-delve/delve/service/dap
#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:107:1: syntax error: unexpected <<, expecting field name or embedded type
#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:110:1: syntax error: unexpected ==, expecting field name or embedded type
#9 75.27 /usr/src/github.com/go-delve/delve/service/dap/server.go:113:1: syntax error: unexpected >>, expecting field name or embedded type
```
This commit is contained in:
John-Michael Faircloth 2021-05-17 12:14:09 -05:00 committed by GitHub
parent d2bca7a307
commit 547388750b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
service/dap/server.go
View File

@ -104,13 +104,10 @@ type Server struct {
variableHandles *variablesHandlesMap variableHandles *variablesHandlesMap
// args tracks special settings for handling debug session requests. // args tracks special settings for handling debug session requests.
args launchAttachArgs args launchAttachArgs
<<<<<<< HEAD
// exceptionErr tracks the runtime error that last occurred. // exceptionErr tracks the runtime error that last occurred.
exceptionErr error exceptionErr error
=======
// clientCapabilities tracks special settings for handling debug session requests. // clientCapabilities tracks special settings for handling debug session requests.
clientCapabilities dapClientCapabilites clientCapabilities dapClientCapabilites
>>>>>>> 1e9c5c3b07dc5f0f2b3b1fb17bde6444cbf7ca30
// mu synchronizes access to objects set on start-up (from run goroutine) // mu synchronizes access to objects set on start-up (from run goroutine)
// and stopped on teardown (from main goroutine) // and stopped on teardown (from main goroutine)