From 038a80b2ffb03c282ad0463e5e9318ed58fbd5f0 Mon Sep 17 00:00:00 2001
From: Laurent <laurent.thomas@open-cells.com>
Date: Fri, 21 Aug 2020 15:50:27 +0200
Subject: [PATCH] fixes after merge

---
 executables/main-ocp.c | 6 ------
 executables/ocp-gnb.c  | 1 +
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/executables/main-ocp.c b/executables/main-ocp.c
index 3c26d16d31..63bd152754 100644
--- a/executables/main-ocp.c
+++ b/executables/main-ocp.c
@@ -1324,14 +1324,8 @@ int main ( int argc, char **argv ) {
 
   // end of CI modifications
   //getchar();
-<<<<<<< HEAD
-  if(IS_SOFTMODEM_DOFORMS) {
-    load_softscope("enb",NULL);
-  }
-=======
   if(IS_SOFTMODEM_DOFORMS)
     load_softscope("enb", NULL);
->>>>>>> 7f28f8d10dc0d73fd4b10d4a89fde554158f9fb5
 
   itti_wait_tasks_end();
   oai_exit=1;
diff --git a/executables/ocp-gnb.c b/executables/ocp-gnb.c
index 5d8acecacf..b4f651b908 100644
--- a/executables/ocp-gnb.c
+++ b/executables/ocp-gnb.c
@@ -46,6 +46,7 @@
 #include <forms.h>
 #include <executables/stats.h>
 #include <openair1/PHY/TOOLS/nr_phy_scope.h>
+#include <openair1/PHY/TOOLS/phy_scope_interface.h>
 
 // Global vars
 #include <openair2/LAYER2/MAC/mac_vars.h>