Manual merge conflict resolution was incorrect.

Signed-off-by: Raphael Defosseux <raphael.defosseux@eurecom.fr>
14 jobs for <span class="ref-name">develop_integration_2019_w04</span> in 0 seconds (queued for 19 minutes and 12 seconds)
Status Job ID Name Coverage
  External
passed Analysis with cppcheck

00:06:08

passed Build UE-ethernet

00:00:08

passed Build basic-sim

00:00:04

passed Build eNb-USRP

00:00:09

passed Build eNb-USRP-CentOS

00:00:17

passed Build eNb-ethernet

00:00:08

passed Build phy-sim

00:04:55

passed Test L2-sim

00:06:09

passed Test basic-sim

00:13:25

passed Test phy-sim

00:11:30

passed Test-FDD-Band7

01:07:22

passed Test-IF4p5-FDD-Band7

01:36:20

passed Test-IF4p5-TDD-Band40

01:45:57

passed Test-TDD-Band40

01:23:19