This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new a55a5e0 Remove bad git conflicts from Readme (#6669)
a55a5e0 is described below
commit a55a5e06c6310bd8da44123be9ef58fe4fc2fe5a
Author: Kaxil Naik <[email protected]>
AuthorDate: Sat Jan 12 17:57:13 2019 +0000
Remove bad git conflicts from Readme (#6669)
---
README.md | 5 -----
1 file changed, 5 deletions(-)
diff --git a/README.md b/README.md
index 950e259..df1cec0 100644
--- a/README.md
+++ b/README.md
@@ -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
