mirror of https://github.com/apache/superset.git
Remove bad git conflicts from Readme (#6669)
This commit is contained in:
parent
b143b16dff
commit
a55a5e06c6
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue