Merge remote-tracking branch 'remotes/origin/MAGETWO-89292-SDL' into MAGETWO-89292-SDL

Author: Eric Bohanon

dev/tests/api-functional/_files/Magento/TestModuleGraphQlQuery/Model/Resolver/Item.php

@@ -7,7 +7,7 @@
 
 namespace Magento\TestModuleGraphQlQuery\Model\Resolver;
 
-use GraphQL\Type\Definition\ResolveInfo;
+use Magento\Framework\GraphQl\Schema\Type\ResolveInfo;
 use Magento\Framework\GraphQl\Config\Element\Field;
 use Magento\Framework\GraphQl\Query\PostFetchProcessorInterface;
 use Magento\Framework\GraphQl\Query\Resolver\Value;

lib/internal/Magento/Framework/GraphQl/Schema/Type/Output/ElementMapper/Formatter/Fields.php

@@ -60,8 +60,6 @@ class Fields implements FormatterInterface
      */
     private $resolveInfoFactory;
 
-
-
     /**
      * @param ObjectManagerInterface $objectManager
      * @param OutputMapper $outputMapper