Merge remote-tracking branch 'origin/F1_interop_ACC_n78' into integration_2022_wk25

2022-06-23 14:09:33 +02:00
parent 644422ebec 304c92c639
commit b37050ac6e
46 changed files with 2520 additions and 907 deletions
@@ -339,4 +339,7 @@ log_config :
  ngap_log_level                        ="debug";
  f1ap_log_level                        ="debug";
 };
+<<<<<<< HEAD
+=======

+>>>>>>> origin/develop