Skip to content

Commit

Permalink
fix merge conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
vektah committed Nov 28, 2019
1 parent cdf9672 commit f0b83cb
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions codegen/testserver/interfaces_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestInterfaces(t *testing.T) {
panic("should not be called")
}

srv := handler.GraphQL(
srv := handler.NewDefaultServer(
NewExecutableSchema(Config{
Resolvers: resolvers,
Directives: DirectiveRoot{
Expand All @@ -71,7 +71,7 @@ func TestInterfaces(t *testing.T) {
panic("should not be called")
}

srv := handler.GraphQL(
srv := handler.NewDefaultServer(
NewExecutableSchema(Config{
Resolvers: resolvers,
Directives: DirectiveRoot{
Expand Down

0 comments on commit f0b83cb

Please sign in to comment.