Version-2.5.1

zingchart · Dec 1, 2016 · 310944a · 310944a
1 parent 6d0f99c
commit 310944a
Showing 1 changed file with 1 addition and 6 deletions.
diff --git a/README.md b/README.md
@@ -1,11 +1,6 @@
-<<<<<<< HEAD
-# [ZingChart](https://www.zingchart.com/)
-Build v2.5.0
-=======
-# ZingChart
 
+# [ZingChart](https://www.zingchart.com/)
 Build v2.5.1
->>>>>>> 2b83040... Version-2.5.1
 
 A declarative, efficient, and simple JavaScript library for building responsive charts. With integrations in Angular, React, JQuery, PHP, Ember, & Backbone.