merge conflicts

This commit is contained in:
Adrien Marquès 2018-09-28 16:02:51 +02:00
commit 0de217f362
1 changed files with 0 additions and 2 deletions

View File

@ -119,7 +119,6 @@ func (d *Generic) LoadMiddleware(_path string) (func(http.Request, *[]string), e
/* (4) Get as []string */ /* (4) Get as []string */
scope, ok := outputI.([]interface{}) scope, ok := outputI.([]interface{})
if !ok { if !ok {
fmt.Printf("3\n")
return return
} }
@ -127,7 +126,6 @@ func (d *Generic) LoadMiddleware(_path string) (func(http.Request, *[]string), e
for _, v := range scope { for _, v := range scope {
stringScope, ok := v.(string) stringScope, ok := v.(string)
if !ok { if !ok {
fmt.Printf("4\n")
continue continue
} }
*_scope = append(*_scope, stringScope) *_scope = append(*_scope, stringScope)