Fix merge conflict

MarkRobbo · MarkRobbo · commit a90cbdd003a7 · 2017-08-24T15:37:06.000+01:00
diff --git a/src/main/java/org/commonwl/view/workflow/WorkflowService.java b/src/main/java/org/commonwl/view/workflow/WorkflowService.java
@@ -306,7 +306,7 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)
                     }
                 }
             }
-            File localPath = repo.getRepository().getWorkTree();
+            Path localPath = repo.getRepository().getWorkTree().toPath();
             String latestCommit = gitService.getCurrentCommitID(repo);
 
             Path workflowFile = localPath.resolve(gitInfo.getPath()).normalize().toAbsolutePath();

Original file line number	Diff line number	Diff line change
`@@ -306,7 +306,7 @@ public QueuedWorkflow createQueuedWorkflow(GitDetails gitInfo)`
`306`	`306`	`}`
`307`	`307`	`}`
`308`	`308`	`}`
`309`		`- File localPath = repo.getRepository().getWorkTree();`
	`309`	`+ Path localPath = repo.getRepository().getWorkTree().toPath();`
`310`	`310`	`String latestCommit = gitService.getCurrentCommitID(repo);`
`311`	`311`
`312`	`312`	`Path workflowFile = localPath.resolve(gitInfo.getPath()).normalize().toAbsolutePath();`