fix merge conflict for Hapi

This commit is contained in:
Nick Nance 2016-10-17 07:27:40 -07:00
parent da1e3749c2
commit 0c5b6850dc

View file

@ -220,6 +220,7 @@ function renderGraphiQL(route, graphiqlParams: any, reply) {
query: graphiqlParams.query || graphiqlOptions.query,
variables: JSON.parse(graphiqlParams.variables) || graphiqlOptions.variables,
operationName: graphiqlParams.operationName || graphiqlOptions.operationName,
passHeader: graphiqlOptions.passHeader,
});
reply(graphiQLString);
}