Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix build error due to unresolved merge conflict #2493

Merged
merged 1 commit into from
May 17, 2021
Merged

Fix build error due to unresolved merge conflict #2493

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions service/dap/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,13 +104,10 @@ type Server struct {
variableHandles *variablesHandlesMap
// args tracks special settings for handling debug session requests.
args launchAttachArgs
<<<<<<< HEAD
// exceptionErr tracks the runtime error that last occurred.
exceptionErr error
=======
// clientCapabilities tracks special settings for handling debug session requests.
clientCapabilities dapClientCapabilites
>>>>>>> 1e9c5c3b07dc5f0f2b3b1fb17bde6444cbf7ca30

// mu synchronizes access to objects set on start-up (from run goroutine)
// and stopped on teardown (from main goroutine)
Expand Down