Fix typo

Signed-off-by: Julia Pineda <[email protected]>
sdgtt · Mar 21, 2024 · 06ccddd · 06ccddd
1 parent d2170a9
commit 06ccddd
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/nebula/manager.py b/nebula/manager.py
@@ -429,20 +429,15 @@ def board_reboot_uart_net_pdu(
         sdcard=False,
     ):
         """Manager when UART, PDU, and Network are available"""
-<<<<<<< HEAD
         if not sdcard:
             self._check_files_exist(
-<<<<<<< HEAD
                 system_top_bit_path,
                 bootbinpath,
                 uimagepath,
                 devtreepath,
                 extlinux_path,
                 scr_path,
                 preloader_path,
-=======
-                system_top_bit_path, bootbinpath, uimagepath, devtreepath
->>>>>>> 497fc8d (fix lint)
             )
         try:
             # Flush UART