Skip to content

Commit

Permalink
Refs #10656 Get rid of merge issue
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonPiccardoSelg committed Mar 4, 2015
1 parent 55ab31e commit c6a974e
Showing 1 changed file with 1 addition and 4 deletions.
Expand Up @@ -509,12 +509,9 @@ namespace Mantid
while(filter1)
{
vtkSMProxy* proxy1 = NULL;
pqPipelineFilter* newFilter = NULL;

proxy1 = filter1->getProxy();
pqPipelineFilter* newFilter = NULL;
pqPipelineSource* newPipelineElement = NULL;

pqPipelineFilter* newFilter = NULL;
// Move source2 to its end.
while (endOfSource2Pipeline->getNumberOfConsumers() > 0)
{
Expand Down

0 comments on commit c6a974e

Please sign in to comment.