[API-NEXT,13/15] merge fix: test/common_plat/validation/api/packet/packet.h

Message ID 20170127142921.29029-14-maxim.uvarov@linaro.org
State New
Headers show
Series
  • Merge tag 'v1.13.0.0' into api-next
Related show

Commit Message

Maxim Uvarov Jan. 27, 2017, 2:29 p.m.
Signed-off-by: Maxim Uvarov <maxim.uvarov@linaro.org>

---
 test/common_plat/validation/api/packet/packet.h | 3 ---
 1 file changed, 3 deletions(-)

-- 
2.11.0.295.gd7dffce

Patch

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);