Fix conflicts

Signed-off-by: Francesco Guardiani <francescoguard@gmail.com>
cloudevents · Oct 8, 2020 · f85c6ec · f85c6ec
1 parent 443c877
commit f85c6ec
Showing 1 changed file with 20 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -24,28 +24,29 @@ a Cloud Native sandbox level project on
 
 The following documents are available:
 
-|                               |                                 Latest Release                                 |                                    Working Draft                                    |
-| :---------------------------- | :----------------------------------------------------------------------------: | :---------------------------------------------------------------------------------: |
+|                               |                                 Latest Release                                  |                                      Working Draft                                       |
+| :---------------------------- | :-----------------------------------------------------------------------------: | :--------------------------------------------------------------------------------------: |
 | **Core Specification:**       |
-| CloudEvents                   |         [v1.0](https://github.com/cloudevents/spec/blob/v1.0/spec.md)          |          [master](https://github.com/cloudevents/spec/blob/master/spec.md)          |
+| CloudEvents                   |          [v1.0](https://github.com/cloudevents/spec/blob/v1.0/spec.md)          |            [master](https://github.com/cloudevents/spec/blob/master/spec.md)             |
 |                               |
 | **Optional Specifications:**  |
-| AMQP Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/amqp-protocol-binding.md) | [master](https://github.com/cloudevents/spec/blob/master/amqp-protocol-binding.md)  |
-| AVRO Event Format             | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/avro-format.md)           | [master](https://github.com/cloudevents/spec/blob/master/avro-format.md)            |
-| HTTP Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md) | [master](https://github.com/cloudevents/spec/blob/master/http-protocol-binding.md)  |
-| JSON Event Format             |      [v1.0](https://github.com/cloudevents/spec/blob/v1.0/json-format.md)      |      [master](https://github.com/cloudevents/spec/blob/master/json-format.md)       |
-| Kafka Protocol Binding        | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/kafka-protocol-binding.md) | [master](https://github.com/cloudevents/spec/blob/master/kafka-protocol-binding.md) |
-| MQTT Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/mqtt-protocol-binding.md) | [master](https://github.com/cloudevents/spec/blob/master/mqtt-protocol-binding.md)  |
-| NATS Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/nats-protocol-binding.md) | [master](https://github.com/cloudevents/spec/blob/master/nats-protocol-binding.md)  |
-| Protobuf Event Format | | [master][proto-working] |
-| Web hook                      |     [v1.0](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md)      |      [master](https://github.com/cloudevents/spec/blob/master/http-webhook.md)      |
+| AMQP Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/amqp-protocol-binding.md)  |    [master](https://github.com/cloudevents/spec/blob/master/amqp-protocol-binding.md)    |
+| AVRO Event Format             |      [v1.0](https://github.com/cloudevents/spec/blob/v1.0/avro-format.md)       |         [master](https://github.com/cloudevents/spec/blob/master/avro-format.md)         |
+| HTTP Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/http-protocol-binding.md)  |    [master](https://github.com/cloudevents/spec/blob/master/http-protocol-binding.md)    |
+| JSON Event Format             |      [v1.0](https://github.com/cloudevents/spec/blob/v1.0/json-format.md)       |         [master](https://github.com/cloudevents/spec/blob/master/json-format.md)         |
+| Kafka Protocol Binding        | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/kafka-protocol-binding.md) |   [master](https://github.com/cloudevents/spec/blob/master/kafka-protocol-binding.md)    |
+| MQTT Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/mqtt-protocol-binding.md)  |    [master](https://github.com/cloudevents/spec/blob/master/mqtt-protocol-binding.md)    |
+| NATS Protocol Binding         | [v1.0](https://github.com/cloudevents/spec/blob/v1.0/nats-protocol-binding.md)  |    [master](https://github.com/cloudevents/spec/blob/master/nats-protocol-binding.md)    |
+| WebSockets Protocol Binding   |                                        -                                        | [master](https://github.com/cloudevents/spec/blob/master/websockets-protocol-binding.md) |
+| Protobuf Event Format         |                                                                                 |                                 [master][proto-working]                                  |
+| Web hook                      |      [v1.0](https://github.com/cloudevents/spec/blob/v1.0/http-webhook.md)      |        [master](https://github.com/cloudevents/spec/blob/master/http-webhook.md)         |
 |                               |
 | **Additional Documentation:** |
-| CloudEvents Adapters          |                                       -                                        |        [master](https://github.com/cloudevents/spec/blob/master/adapters.md)        |
-| CloudEvents SDK Requirements  |                                       -                                        |          [master](https://github.com/cloudevents/spec/blob/master/SDK.md)           |
-| Documented Extensions         |                                       -                                        | [master](https://github.com/cloudevents/spec/blob/master/documented-extensions.md)  |
-| Primer                        |        [v1.0](https://github.com/cloudevents/spec/blob/v1.0/primer.md)         |         [master](https://github.com/cloudevents/spec/blob/master/primer.md)         |
-| Proprietary Specifications    |                                       -                                        |   [master](https://github.com/cloudevents/spec/blob/master/proprietary-specs.md)    |
+| CloudEvents Adapters          |                                        -                                        |          [master](https://github.com/cloudevents/spec/blob/master/adapters.md)           |
+| CloudEvents SDK Requirements  |                                        -                                        |             [master](https://github.com/cloudevents/spec/blob/master/SDK.md)             |
+| Documented Extensions         |                                        -                                        |    [master](https://github.com/cloudevents/spec/blob/master/documented-extensions.md)    |
+| Primer                        |         [v1.0](https://github.com/cloudevents/spec/blob/v1.0/primer.md)         |           [master](https://github.com/cloudevents/spec/blob/master/primer.md)            |
+| Proprietary Specifications    |                                        -                                        |      [master](https://github.com/cloudevents/spec/blob/master/proprietary-specs.md)      |
 
 If you are new to CloudEvents, it is recommended that you start by reading the
 [Primer](primer.md) for an overview of the specification's goals and design
@@ -79,8 +80,8 @@ native ecosystem by making our systems interoperable with CloudEvents.
 - How to [contribute](community/CONTRIBUTING.md) via issues and pull requests.
 - [Contributors](community/contributors.md): people and organizations who helped
   us get started or are actively working on the CloudEvents specification.
-- [Demos & open source](community/README.md) -- if you have
-  something to share about your use of CloudEvents, please submit a PR!
+- [Demos & open source](community/README.md) -- if you have something to share
+  about your use of CloudEvents, please submit a PR!
 
 ## Process