Remove bad git conflicts from Readme (#6669)

This commit is contained in:
Kaxil Naik 2019-01-12 17:57:13 +00:00 committed by Maxime Beauchemin
parent b143b16dff
commit a55a5e06c6
1 changed files with 0 additions and 5 deletions

View File

@ -198,8 +198,3 @@ the world know they are using Superset. Join our growing community!
1. [Yahoo!](https://yahoo.com/)
1. [Zaihang](http://www.zaih.com/)
1. [Zalando](https://www.zalando.com)
<<<<<<< HEAD
1. [Fordeal](http://www.fordeal.com)
=======
>>>>>>> Add companies frmo https://stackshare.io/superset/in-stacks