Skip to content
Commit e4fd4807 authored by Jacob Bohlin's avatar Jacob Bohlin Committed by Tim Hall
Browse files

doc: Remove remains of a merge-conflict in OPTIONS.md 



Signed-off-by: Jacob Bohlin's avatarJacob Bohlin <jacob.bohlin@arm.com>
Change-Id: Id6dc0aac1b8b493d65c9c8ea132f5c4b5e273654
parent 2a7ebe30
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment