From aa736472cc9e659450ce822e91e36b94c07aede1 Mon Sep 17 00:00:00 2001 From: pdxlocations Date: Sat, 8 Feb 2025 18:02:49 -0800 Subject: [PATCH] fix conflict --- main.py | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/main.py b/main.py index da9609b..46b3717 100644 --- a/main.py +++ b/main.py @@ -11,10 +11,7 @@ from pubsub import pub import os import logging import traceback -<<<<<<< HEAD -======= import threading ->>>>>>> cd74a32 (try a threading lock) from utilities.arg_parser import setup_parser from utilities.interfaces import initialize_interface @@ -53,7 +50,7 @@ def main(stdscr): with lock: globals.interface = initialize_interface(args) logging.info("Interface initialized") - + globals.myNodeNum = get_nodeNum() globals.channel_list = get_channels() globals.node_list = get_node_list()