This commit is contained in:
Mike Barnett 2017-07-14 17:06:22 -07:00
Родитель 33d779a03a
Коммит e5ba464fe9
1 изменённых файлов: 0 добавлений и 6 удалений

Просмотреть файл

@ -908,17 +908,11 @@ namespace ScopeProgramAnalysis
{
try
{
<<<<<<< HEAD
var resultOfProducesMethod = ExecuteProducesMethod(factoryMethod, inputSchema);
var declaredPassThroughDictionary = resultOfProducesMethod.Item1;
declaredPassthroughString = String.Join("|", declaredPassThroughDictionary.Select(e => e.Key + " <: " + e.Value));
var dependenceDictionary = resultOfProducesMethod.Item2;
declaredDependencyString = String.Join("|", dependenceDictionary.Select(e => e.Key + " <: " + e.Value));
=======
var declaredPassthrough = ExecuteProducesMethod(factoryMethod, inputSchema);
declaredPassthroughString = String.Join("|", declaredPassthrough.Select(e => e.Key + " <: " + e.Value));
>>>>>>> aa57025760a6032e8306e06491ef42d8704e22ba
} catch (Exception e)
{
declaredPassthroughString = "Exception while trying to execute produces method: " + e.Message;