Skip to content
Commit 81aa1621 authored by Jason Fox's avatar Jason Fox
Browse files

Fix Merge Conflict with DATA(25)000177_NGSI-LD_Core_Temporal_Pagination 

# Conflicts:
#	md/annex-b.md
#	md/clause-5.md
parents afb6f83e 44eb5486
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment