Projects >> FXForm2 >>b4e71d3ef930e716d1f6b382f83e27817f08a9c2

Chunk
Conflicting content 
    @Override
    public String getSampleSourceURL() {
<<<<<<< HEAD
        return "";
=======
        return "https://github.com/dooApp/FXForm2/raw/master/samples/src/main/java/com/dooapp/fxform/samples/SimpleForm.java";
>>>>>>> ceb38783bdec20fa0a6652595c38994b37992119
    }
    @Override
    public String getSampleDescription() {
Solution content 
    @Override
    public String getSampleSourceURL() {
        return "https://github.com/dooApp/FXForm2/raw/master/samples/src/main/java/com/dooapp/fxform/samples/SimpleForm.java";
    }

    @Override
    public String getSampleDescription() {
File
SimpleForm.java
Developer's decision
Manual
Kind of conflict
Return statement