Merge remote-tracking branch 'origin/astro-develop-patch-97937' into integration_2022_wk36b

1d4d22e3 · Robert Schmidt · 8e4c7a11 · f06fc314 · 1d4d22e3
Commit 1d4d22e3 authored Sep 08, 2022 by Robert Schmidt
Hide 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