1
0
mirror of https://github.com/ClusterCockpit/cc-backend synced 2025-07-27 06:36:07 +02:00

Fix more merge bugs

This commit is contained in:
Jan Eitzinger
2023-04-12 07:30:41 +02:00
parent 33ed07a35a
commit ecd0709851
2 changed files with 1 additions and 4 deletions

@@ -341,8 +341,6 @@ func (fsa *FsArchive) ImportJob(
}
if err := f.Close(); err != nil {
log.Warn("Error while closing data.json file")
return err
}
return f.Close()
return err
}

@@ -494,7 +494,6 @@ func TestRestApi(t *testing.T) {
}
const stopJobBody string = `{
"jobId": 123,
"jobId": 123,
"startTime": 123456789,
"cluster": "testcluster",