Fix remaining conflict diff
This commit is contained in:
		
							parent
							
								
									bcf1965a6c
								
							
						
					
					
						commit
						b9712098ef
					
				| @ -110,10 +110,6 @@ func (f *BaseSessionHandler) GetConfig() engine.Config { | ||||
| 	return f.cfgTemplate | ||||
| } | ||||
| 
 | ||||
| <<<<<<< HEAD:handlers/base.go | ||||
| func(f *BaseSessionHandler) GetRequestParser() request.RequestParser { | ||||
| ======= | ||||
| func (f *BaseSessionHandler) GetRequestParser() RequestParser { | ||||
| >>>>>>> master:internal/handlers/base.go | ||||
| 	return f.rp | ||||
| } | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user