fix merge issue

This commit is contained in:
adam-m 2013-02-12 12:28:04 -05:00
parent 5e58633459
commit 790cfaa080

View File

@ -573,25 +573,7 @@ public class Case {
return "ModuleOutput";
}
/**
* Get absolute module output directory path where modules should save their permanent data
* The directory is a subdirectory of this case dir.
* @return absolute path to the module output dir
*/
public String getModulesOutputDirectoryPath() {
return this.getCaseDirectory() + File.separator + getModulesOutputDirectory();
}
/**
* Get relative (with respect to case dir)
* module output directory path where modules should save their permanent data
* The directory is a subdirectory of this case dir.
* @return relative path to the module output dir
*/
public String getModulesOutputDirectory() {
return "ModuleOutput";
}
/**
* get the PropertyChangeSupport of this class