From 38adf957f67e0858af76cec4b08c379f64dc5c59 Mon Sep 17 00:00:00 2001
From: Ken Takagiwa <ken@Kens-MacBook-Pro.local>
Date: Tue, 15 Jul 2014 21:08:43 -0700
Subject: [PATCH] added reducedByKey not working yet

---
 python/pyspark/streaming/utils.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/python/pyspark/streaming/utils.py b/python/pyspark/streaming/utils.py
index ad1dab0696b1a..9178577743e0b 100644
--- 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