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

2022-09-08 20:42:35 +02:00
parent 8e4c7a1115 f06fc314c6
commit 1d4d22e37e
1 changed files with 0 additions and 4 deletions
@@ -339,7 +339,3 @@ log_config :
  ngap_log_level                        ="debug";
  f1ap_log_level                        ="debug";
 };
-<<<<<<< HEAD
-=======
-
->>>>>>> origin/develop