Projects >> teamcity-nuget-support >>1014150cdb2e594d6fa79f07994816aaacdb3982

Chunk
Conflicting content
      throw new NotImplementedException();
    }

<<<<<<< HEAD
    final Iterable objects = targetFunction.call(function.getReturnType(), params, queryInfo);
    if(objects == null) return null;
=======
    myRecentRequests.reportFunctionCall(targetFunction.getName());

    final Iterable functionCallResult = targetFunction.call(function.getReturnType(), params, queryInfo);
    if(functionCallResult == null) return null;
>>>>>>> 996a12debf7b7c99f59b478090f1661813938de8

    final RequestContext rc = RequestContext.newBuilder(RequestContext.RequestType.GetEntities)
            .entitySetName(MetadataConstants.ENTITY_SET_NAME)
Solution content
      throw new NotImplementedException();
    }

    myRecentRequests.reportFunctionCall(targetFunction.getName());

    final Iterable functionCallResult = targetFunction.call(function.getReturnType(), params, queryInfo);
    if(functionCallResult == null) return null;

    final RequestContext rc = RequestContext.newBuilder(RequestContext.RequestType.GetEntities)
            .entitySetName(MetadataConstants.ENTITY_SET_NAME)
File
NuGetFeedInMemoryProducer.java
Developer's decision
Version 2
Kind of conflict
If statement
Method invocation
Variable