From 65d64518db3653bb043218b54934614680ad68bc Mon Sep 17 00:00:00 2001
From: hardy <remi.hardy@openairinterface.org>
Date: Wed, 13 Oct 2021 16:12:06 +0200
Subject: [PATCH] typo fix

---
 ci-scripts/ran.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/ci-scripts/ran.py b/ci-scripts/ran.py
index fa97d8f3e1..35ef4005de 100644
--- a/ci-scripts/ran.py
+++ b/ci-scripts/ran.py
@@ -38,10 +38,6 @@ import os
 import time
 from multiprocessing import Process, Lock, SimpleQueue
 import yaml
-<<<<<<< HEAD
-
-=======
->>>>>>> 90c6b8b58b... copyout workaround
 
 #-----------------------------------------------------------
 # OAI Testing modules