github.com/livingcomputermuseum.UniBone
1
0
Fork 0
mirror of https://github.com/livingcomputermuseum/UniBone.git synced 2026-01-28 12:49:08 +00:00
Code Issues Releases Wiki Activity

Removing merge marker from menu_devices.cpp.

Browse Source
This commit is contained in:
Josh Dersch
2019-06-19 22:48:32 +02:00
parent 76166ce7a1
commit 00627567bf
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
10.03_app_demo/2_src/menu_devices.cpp
View File

@@ -176,7 +176,6 @@ void application_c::menu_devices(bool with_CPU) {
// now devices are "Plugged in". Reset PDP-11.
unibus->powercycle();
>>>>>>> upstream/master
while (!ready) {