Skip to content

Commit

Permalink
FIXUP - rebase conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mvollmer committed Aug 28, 2024
1 parent cb0a364 commit b128a8e
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions pkg/storaged/block/erase-dialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import {
dialog_open,
CheckBoxes,
BlockingMessage, TeardownMessage,
init_active_usage_processes
init_teardown_usage,
} from "../dialog.jsx";

Check notice

Code scanning / CodeQL

Unused variable, import, function or class Note

Unused import CheckBoxes.

import { job_progress_wrapper } from "../jobs-panel.jsx";
Expand Down Expand Up @@ -64,7 +64,7 @@ export function erase_dialog(block) {
}
},
Inits: [
init_active_usage_processes(client, usage),
init_teardown_usage(client, usage),
]
});
}
2 changes: 1 addition & 1 deletion pkg/storaged/block/format-dialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -534,7 +534,7 @@ export function format_dialog(block, options) {
}
},
Inits: [
init_active_usage_processes(client, usage),
init_teardown_usage(client, usage),
]
});
}
4 changes: 2 additions & 2 deletions pkg/storaged/swap/format-dialog.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import {
import {
dialog_open,
BlockingMessage, TeardownMessage,
init_active_usage_processes
init_teardown_usage,
} from "../dialog.jsx";

import { job_progress_wrapper } from "../jobs-panel.jsx";
Expand Down Expand Up @@ -92,7 +92,7 @@ export function format_swap_dialog(block) {
}
},
Inits: [
init_active_usage_processes(client, usage),
init_teardown_usage(client, usage),
]
});
}

0 comments on commit b128a8e

Please sign in to comment.