Projects >> XCoLab >>5267821aa7b799882d4aaa8f3d66acf9b8a61d5f

Chunk
Conflicting content 
    private String[] _methodParameterTypes690;
    private String _methodName691;
    private String[] _methodParameterTypes691;
<<<<<<< HEAD
    private String _methodName692;
    private String[] _methodParameterTypes692;
    private String _methodName693;
    private String[] _methodParameterTypes693;
    private String _methodName694;
    private String[] _methodParameterTypes694;
    private String _methodName695;
    private String[] _methodParameterTypes695;
=======
>>>>>>> 72edfca710b017bd7a17cbd68c596b10432b7d2c
    public ContestLocalServiceClpInvoker() {
        _methodName0 = "addContest";
Solution content 
    private String[] _methodParameterTypes690;
    private String _methodName691;
    private String[] _methodParameterTypes691;
    private String _methodName692;
    private String[] _methodParameterTypes692;
    private String _methodName693;
    private String[] _methodParameterTypes693;
    private String _methodName694;
    private String[] _methodParameterTypes694;
    private String _methodName695;
    private String[] _methodParameterTypes695;

    public ContestLocalServiceClpInvoker() {
        _methodName0 = "addContest";
File
ContestLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Chunk
Conflicting content 
        _methodName691 = "getPointsAccessibleForActivePhaseOfContest";

        _methodParameterTypes691 = new String[] { "com.ext.portlet.model.Contest" };
<<<<<<< HEAD

        _methodName692 = "getContestImpactTemplateSeries";

        _methodParameterTypes692 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName693 = "getContestImpactIterations";

        _methodParameterTypes693 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName694 = "getContestImpactFocusAreaList";

        _methodParameterTypes694 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName695 = "getContestImpactFocusAreas";

        _methodParameterTypes695 = new String[] { "com.ext.portlet.model.Contest" };
=======
>>>>>>> 72edfca710b017bd7a17cbd68c596b10432b7d2c
    }

    public Object invokeMethod(String name, String[] parameterTypes,
Solution content 
        _methodName691 = "getPointsAccessibleForActivePhaseOfContest";

        _methodParameterTypes691 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName692 = "getContestImpactTemplateSeries";

        _methodParameterTypes692 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName693 = "getContestImpactIterations";

        _methodParameterTypes693 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName694 = "getContestImpactFocusAreaList";

        _methodParameterTypes694 = new String[] { "com.ext.portlet.model.Contest" };

        _methodName695 = "getContestImpactFocusAreas";

        _methodParameterTypes695 = new String[] { "com.ext.portlet.model.Contest" };
    }

    public Object invokeMethod(String name, String[] parameterTypes,
File
ContestLocalServiceClpInvoker.java
Developer's decision
Version 1
Kind of conflict
Attribute
Method invocation