From 6da5516da8e0d71e45c3fd1290ad400d6d7a9c68 Mon Sep 17 00:00:00 2001 From: John-Michael Faircloth Date: Mon, 17 May 2021 11:57:14 -0500 Subject: [PATCH] Fix build error due to unresolved merge conflict 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 ``` --- service/dap/server.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/service/dap/server.go b/service/dap/server.go index 2cf7f5bf90..0d80855875 100644 --- a/service/dap/server.go +++ b/service/dap/server.go @@ -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)