added reducedByKey not working yet

markhamstra · Sep 20, 2014 · 38adf95 · 38adf95
1 parent 66fcfff
commit 38adf95
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/python/pyspark/streaming/utils.py b/python/pyspark/streaming/utils.py
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with