Conflicts: src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/printer/standard.py |
||
|---|---|---|
| .. | ||
| _files | ||
| __init__.py | ||
| test_filemanager.py | ||
| test_localstorage.py | ||
Conflicts: src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/printer/standard.py |
||
|---|---|---|
| .. | ||
| _files | ||
| __init__.py | ||
| test_filemanager.py | ||
| test_localstorage.py | ||