diff options
| author | Jacob Bohlin <jacob.bohlin@arm.com> | 2020-06-17 09:19:21 +0200 |
|---|---|---|
| committer | Tim Hall <tim.hall@arm.com> | 2020-06-18 17:53:52 +0100 |
| commit | e4fd48078f1f3e840ddda1a78d483547760f2287 (patch) | |
| tree | 123fb7494fa7cdb899d0c7a27b60aae77cf8cfa5 /setup.py | |
| parent | 2a7ebe3045d766c7abdb3bca49e90f3f9afb8664 (diff) | |
| download | ethos-u-vela-e4fd48078f1f3e840ddda1a78d483547760f2287.tar.gz | |
doc: Remove remains of a merge-conflict in OPTIONS.md1.0.0
Signed-off-by: Jacob Bohlin <jacob.bohlin@arm.com>
Change-Id: Id6dc0aac1b8b493d65c9c8ea132f5c4b5e273654
Diffstat (limited to 'setup.py')
0 files changed, 0 insertions, 0 deletions