quick fix for gnb.sa.band41.fr1.106PRB.usrpb210.conf

f06fc314 · Abdelrahman Astro · 8229f00d · f06fc314
Commit f06fc314 authored Sep 03, 2022 by Abdelrahman Astro
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf ...ENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf +0 -4

No files found.
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band41.fr1.106PRB.usrpb210.conf
@@ -339,7 +339,3 @@ log_config :
  ngap_log_level                        ="debug";
  f1ap_log_level                        ="debug";
 };
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/develop