Conflicts: src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/printer/standard.py |
||
|---|---|---|
| .. | ||
| filemanager | ||
| plugin | ||
| printer | ||
| settings | ||
| slicing | ||
| static/js | ||
| timelapse | ||
| users | ||
| util | ||
| test_daemon.py | ||
Conflicts: src/octoprint/plugins/virtual_printer/virtual.py src/octoprint/printer/standard.py |
||
|---|---|---|
| .. | ||
| filemanager | ||
| plugin | ||
| printer | ||
| settings | ||
| slicing | ||
| static/js | ||
| timelapse | ||
| users | ||
| util | ||
| test_daemon.py | ||