From 4dbf576987ced0effaaebb0857cc7bfe7c282ac1 Mon Sep 17 00:00:00 2001 From: Hao Chen Date: Sun, 11 Sep 2016 17:08:56 +0800 Subject: [PATCH] Fix merging --- README.md | 5 ----- 1 file changed, 5 deletions(-) diff --git a/README.md b/README.md index 00d005e..7084d2f 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,9 @@ flink-siddhi ============ -<<<<<<< HEAD [![Clojars Project](https://img.shields.io/clojars/v/com.github.haoch/flink-siddhi_2.10.svg)](https://clojars.org/com.github.haoch/flink-siddhi_2.10) - -> A light-weight library to run siddhi cep within flink streaming application. -======= > A light-weight library to run [Siddhi CEP](https://github.com/wso2/siddhi) within [Apache Flink](https://github.com/apache/flink) streaming application. ->>>>>>> 513b38aa608cf5330ce47e607a177f19011636c9 __Version:`1.2-SNAPSHOT`__