Conflict markers in examples/README.md

oasis-open / csaf-documentation

OASIS TC Open Repository: A GitHub repository for management of non-normative information about the work of the CSAF Technical Committee, including documentation

https://oasis-open.github.io/csaf-documentation/

BSD 3-Clause "New" or "Revised" License

19 stars 11 forks source link

Conflict markers in examples/README.md #41

Closed rgacogne closed 1 year ago

rgacogne commented 1 year ago

Hi,

There are git conflict markers in the current master (3617676e451d0eb21ac1792682e2535071e31bf6) version of examples/README.md, probably from a bad merge.

tschmidtb51 commented 1 year ago

@santosomar: I guess we should either a) remove the directory (and link on the website to the TC's repo) or b) remove the content and use new CSAF examples (happy to provide them)

santosomar commented 1 year ago

I pointed https://csaf.io/examples to the CSAF TC examples and added the new Explaining x_generic_uris post.