Projects >> JWildfire >>5321565287f472e39ce0156c05751418a8fe5dbd

Chunk
Conflicting content 
    registerVariationFunc(DCBubbleFunc.class);
    registerVariationFunc(DCTriangleFunc.class);
    registerVariationFunc(WaveBlurWFFunc.class);
<<<<<<< HEAD
    registerVariationFunc(Rational3Func.class);
=======
    registerVariationFunc(PostHeatFunc.class);
    registerVariationFunc(CPow3Func.class);
>>>>>>> ec36285d4231617170ccd388286942e741e4a1c7
  }

  private static void registerVariationFunc(
Solution content 
    registerVariationFunc(DCBubbleFunc.class);
    registerVariationFunc(DCTriangleFunc.class);
    registerVariationFunc(WaveBlurWFFunc.class);

    registerVariationFunc(PostHeatFunc.class);
    registerVariationFunc(CPow3Func.class);
    registerVariationFunc(Rational3Func.class);
  }

  private static void registerVariationFunc(
File
VariationFuncList.java
Developer's decision
Concatenation
Kind of conflict
Method invocation