Skip to content

Commit

Permalink
remove extra lines from conflict resolution
Browse files Browse the repository at this point in the history
  • Loading branch information
Chris Collins authored and Chris Collins committed Apr 29, 2022
1 parent c0c2607 commit cb02322
Showing 1 changed file with 0 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,6 @@ public class GmsGraphQLEngine {
/**
* Configures the graph objects that can be browsed.
*/

public final List<BrowsableEntityType<?, ?>> browsableTypes;

public GmsGraphQLEngine(
Expand Down Expand Up @@ -481,7 +480,6 @@ private void configureQueryResolvers(final RuntimeWiring.Builder builder) {
this.ingestionConfiguration,
this.authenticationConfiguration,
this.authorizationConfiguration,

supportsImpactAnalysis, this.visualConfiguration, this.telemetryConfiguration))
.dataFetcher("me", new MeResolver(this.entityClient))
.dataFetcher("search", new SearchResolver(this.entityClient))
Expand Down

0 comments on commit cb02322

Please sign in to comment.