Projects >> cucumber-jvm >>06e4db929c93cac332ff46d536f2d00429e8081e

Chunk
Conflicting content
        return JRuby.newArray(step_match_list(step_name, formatted_step_name));
    }

<<<<<<< HEAD:cuke4duke/src/main/java/cuke4duke/internal/language/AbstractProgrammingLanguage.java
    public final List step_match_list(String step_name, String formatted_step_name) {
=======
    public abstract void load_code_file(String file) throws Throwable;

    public final List step_match_list(String step_name, String formatted_step_name) throws Throwable {
>>>>>>> 5bdbeb1f3e06985969e3d2f6ba3f7ee1a8d8b0bd:cuke4duke/src/main/java/cuke4duke/internal/language/ProgrammingLanguage.java
        List matches = new ArrayList();
        for(StepDefinition stepDefinition : stepDefinitions){
            List arguments = stepDefinition.arguments_from(step_name);
Solution content
        return JRuby.newArray(step_match_list(step_name, formatted_step_name));
    }

    public abstract void load_code_file(String file) throws Throwable;

    public final List step_match_list(String step_name, String formatted_step_name) throws Throwable {
        List matches = new ArrayList();
        for(StepDefinition stepDefinition : stepDefinitions){
            List arguments = stepDefinition.arguments_from(step_name);
File
AbstractProgrammingLanguage.java
Developer's decision
Version 2
Kind of conflict
Method interface
Method signature