Merge conflicts

2020-04-21 18:18:07 -07:00 · 2020-04-21 18:18:07 -07:00 · b8cbd2e28c
--- a/src/debug_user_code.py
+++ b/src/debug_user_code.py
@ -38,6 +38,7 @@ from common import debugger_communication_client
 # get board so we can get terminal handle
 import board

+
 # get handle to terminal for clue
 curr_terminal = board.DISPLAY.terminal

--- a/src/latest_release_note.ts
+++ b/src/latest_release_note.ts