grassrootseconomics/visedriver
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix remaining conflict diff

Browse Source
This commit is contained in:
lash 2025-01-09 13:49:50 +00:00
parent bcf1965a6c
commit b9712098ef
Signed by: lash
GPG Key ID: 21D2E7BB88C2A746
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
handlers/base.go
View File

@ -110,10 +110,6 @@ func (f *BaseSessionHandler) GetConfig() engine.Config {
return f.cfgTemplate return f.cfgTemplate
} }
<<<<<<< HEAD:handlers/base.go
func(f *BaseSessionHandler) GetRequestParser() request.RequestParser { func(f *BaseSessionHandler) GetRequestParser() request.RequestParser {
=======
func (f *BaseSessionHandler) GetRequestParser() RequestParser {
>>>>>>> master:internal/handlers/base.go
return f.rp return f.rp
} }