From 00627567bfeefb3cc7e21a5611dd98d9c03c1708 Mon Sep 17 00:00:00 2001
From: Josh Dersch <joshd@livingcomputers.org>
Date: Wed, 19 Jun 2019 22:48:32 +0200
Subject: [PATCH] Removing merge marker from menu_devices.cpp.

---
 10.03_app_demo/2_src/menu_devices.cpp | 1 -
 1 file changed, 1 deletion(-)

diff --git a/10.03_app_demo/2_src/menu_devices.cpp b/10.03_app_demo/2_src/menu_devices.cpp
index 7ddbcfd..c855121 100644
--- a/10.03_app_demo/2_src/menu_devices.cpp
+++ b/10.03_app_demo/2_src/menu_devices.cpp
@@ -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) {