readme

README.md

@@ -19,12 +19,7 @@ Available on [Ceylon Herd](https://herd.ceylon-lang.org/modules/herd.schedule.ch
 
 ## Usage and documentation.
 
-<<<<<<< HEAD
-1. Deploy _Chime_ verticle programmatically using `Vertx.deployVerticle("ceylon:herd.schedule.chime/0.1.0")` in any language Vert.x supports. Vert.x downloads the module from [Ceylon Herd](https://herd.ceylon-lang.org) and deploys it. The other way is to deploy _Chime_ with Vert.x CLI, see details in [Vert.x documentation](http://vertx.io/docs/)
-2. Create and listen timers on _EventBus_, see details in [API docs](https://modules.ceylon-lang.org/repo/1/herd/schedule/chime/0.1.0/module-doc/api/index.html)
-=======
 1. Deploy _Chime_ verticle programmatically using `Vertx.deployVerticle("ceylon:herd.schedule.chime/0.1.1")` in any language Vert.x supports. Vert.x downloads the module from [Ceylon Herd](https://herd.ceylon-lang.org) and deploys it. The other way is to deploy _Chime_ with Vert.x CLI, see details in [Vert.x documentation](http://vertx.io/docs/)
 2. Create and listen timers on _EventBus_, see details in [API docs](https://modules.ceylon-lang.org/repo/1/herd/schedule/chime/0.1.1/module-doc/api/index.html)
->>>>>>> refs/remotes/origin/develop
 
 Also, see [example](examples/herd/examples/schedule/chime)