Skip to content

Commit

Permalink
Fix broken merge commit
Browse files Browse the repository at this point in the history
  • Loading branch information
lukfor committed Aug 30, 2023
1 parent e6a7f36 commit e07eb29
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/main/java/com/askimed/nf/test/lang/process/Process.java
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,9 @@ public Channels getOut() {
if (out.isEmpty()) {
throw new RuntimeException("Process has no output channels. process.out can not be used.");
}
return out;
}

public void loadOutputChannels(File metaDir, boolean autoSort) {
out.loadFromFolder(metaDir, autoSort);
}
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/askimed/nf/test/lang/workflow/Workflow.java
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,6 @@ public class Workflow extends WorkflowMeta {
private String mapping = "";

private Channels out = new Channels();

public void setName(String name) {
this.name = name;
}

@Transient
public void setMapping(String mapping) {
Expand Down

0 comments on commit e07eb29

Please sign in to comment.