Fix merging

haoch · Sep 11, 2016 · 4dbf576 · 4dbf576
1 parent 3201e81
commit 4dbf576
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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`__