From 26f3cb8c78c1300914872aa9ada26cf0e78574fe Mon Sep 17 00:00:00 2001 From: Peter Rudenko Date: Tue, 2 Oct 2018 21:36:04 +0300 Subject: [PATCH] Fix README merge conflict (#13) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e73bd1ce..d8babfe7 100755 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@ Example performance speedup for [HiBench](https://github.com/intel-hadoop/HiBenc Test environment: 16 Spark standalone workers, 2x Intel Xeon E5-2697 v3 @ 2.60GHz, 30 cores per Worker, 256GB RAM, non-flash storage (HDD) -======= + ### Terasort ![TeraSort results](https://user-images.githubusercontent.com/1121987/44670087-6c78bb00-aa2a-11e8-834c-71bc177abd87.png)