From 06ccddd0b4eb11feb5fc847a9977a450be7e3221 Mon Sep 17 00:00:00 2001
From: Julia Pineda <Julia.Pineda@analog.com>
Date: Thu, 21 Mar 2024 12:22:58 +0800
Subject: [PATCH] Fix typo

Signed-off-by: Julia Pineda <Julia.Pineda@analog.com>
---
 nebula/manager.py | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nebula/manager.py b/nebula/manager.py
index 50d3ef2e..e2b0854d 100644
--- a/nebula/manager.py
+++ b/nebula/manager.py
@@ -429,10 +429,8 @@ 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,
@@ -440,9 +438,6 @@ def board_reboot_uart_net_pdu(
                 extlinux_path,
                 scr_path,
                 preloader_path,
-=======
-                system_top_bit_path, bootbinpath, uimagepath, devtreepath
->>>>>>> 497fc8d (fix lint)
             )
         try:
             # Flush UART