Signed-off-by: Maxim Uvarov <maxim.uva...@linaro.org> --- test/common_plat/validation/api/packet/packet.h | 3 --- 1 file changed, 3 deletions(-)
diff --git a/test/common_plat/validation/api/packet/packet.h b/test/common_plat/validation/api/packet/packet.h index 95923bc2..783b7a11 100644 --- a/test/common_plat/validation/api/packet/packet.h +++ b/test/common_plat/validation/api/packet/packet.h @@ -35,10 +35,7 @@ void packet_test_concat_extend_trunc(void); void packet_test_extend_small(void); void packet_test_extend_large(void); void packet_test_extend_mix(void); -<<<<<<< HEAD void packet_test_extend_ref(void); -======= ->>>>>>> v1.13.0.0 void packet_test_align(void); void packet_test_offset(void); void packet_test_ref(void); -- 2.11.0.295.gd7dffce
