Skip to content

Commit bb8eacb

Browse files
authored
Merge pull request #401 from LabKey/fb_merge_25.11_to_develop
Merge 25.11 to develop
2 parents 4e69601 + c578bcc commit bb8eacb

File tree

2 files changed

+423
-467
lines changed

2 files changed

+423
-467
lines changed

SequenceAnalysis/src/org/labkey/sequenceanalysis/query/SequenceTriggerHelper.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import java.io.StringWriter;
4646
import java.util.Arrays;
4747
import java.util.Date;
48-
import java.util.HashMap;
4948
import java.util.List;
5049
import java.util.Map;
5150

@@ -238,7 +237,7 @@ public void testTranslation() {
238237
}
239238
}
240239
}
241-
240+
242241
public long createExpData(String relPath) {
243242
PipeRoot pr = PipelineService.get().getPipelineRootSetting(getContainer());
244243
if (pr == null)
@@ -257,7 +256,7 @@ public long createExpData(String relPath) {
257256
{
258257
return d.getRowId();
259258
}
260-
259+
261260
d = ExperimentService.get().createData(getContainer(), new DataType("Output"));
262261
d.setDataFileURI(f.toURI());
263262
d.setName(f.getName());

0 commit comments

Comments
 (0)