John-Michael Faircloth 547388750b service/dap: Fix build error due to unresolved merge conflict (#2493) ... 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 ```		2021-05-17 10:14:09 -07:00
..
api	pkg/proc/native/linux: fix target crashes induced by RequestManualStop (#2484)	2021-05-17 09:56:42 -07:00
dap	service/dap: Fix build error due to unresolved merge conflict (#2493)	2021-05-17 10:14:09 -07:00
debugger	service/dap: implement exception info (#2444)	2021-05-17 09:25:41 -07:00
rpc1	service/rpccommon: fix shutdown related bugs (#2439)	2021-04-19 11:12:51 -07:00
rpc2	service/rpccommon: fix shutdown related bugs (#2439)	2021-04-19 11:12:51 -07:00
rpccommon	service/rpccommon: fix shutdown related bugs (#2439)	2021-04-19 11:12:51 -07:00
test	proc: add way to use CPU registers in expressions (#2446)	2021-05-04 12:56:17 -07:00
client.go	*: Adds toggle command (#2208)	2021-03-19 11:02:23 -07:00
config.go	cmd/dlv: Fix trace output (#2038)	2020-05-13 08:38:10 +02:00
listenerpipe.go	cmd,service: in non-headless mode use an in-memory connection	2018-10-08 15:11:13 -07:00
rpccallback.go	service: serialize calls to Command API (#2370)	2021-03-08 10:05:10 -08:00
server.go	cmd,service: remove temporary def of Server interface in func	2018-10-09 07:56:48 -07:00