From 17a74c6298406589af42dc122a0409494b8ea168 Mon Sep 17 00:00:00 2001
From: Ken Takagiwa <ken@Kens-MacBook-Pro.local>
Date: Wed, 16 Jul 2014 11:12:53 -0700
Subject: [PATCH] modified the code base on comment in
 https://github.com/tdas/spark/pull/10

---
 core/pom.xml                         | 4 ----
 python/pyspark/streaming/__init__.py | 1 -
 python/pyspark/streaming/context.py  | 5 +----
 3 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 7eb0b48eaeebd..2a81f6df289c0 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -21,11 +21,7 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
-<<<<<<< HEAD
     <version>1.2.0-SNAPSHOT</version>
-=======
-    <version>1.0.0</version>
->>>>>>> initial commit for pySparkStreaming
     <relativePath>../pom.xml</relativePath>
   </parent>
 
diff --git a/python/pyspark/streaming/__init__.py b/python/pyspark/streaming/__init__.py
index 719592912e80c..e69de29bb2d1d 100644
--- a/python/pyspark/streaming/__init__.py
+++ b/python/pyspark/streaming/__init__.py
@@ -1 +0,0 @@
-__author__ = 'ktakagiw'
diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py
index c8ae9c4af85c9..40e9d98942e2e 100644
--- a/python/pyspark/streaming/context.py
+++ b/python/pyspark/streaming/context.py
@@ -1,6 +1,3 @@
-__author__ = 'ktakagiw'
-
-
 #
 # Licensed to the Apache Software Foundation (ASF) under one or more
 # contributor license agreements.  See the NOTICE file distributed with
@@ -41,7 +38,7 @@
 
 class StreamingContext(object):
     """
-    Main entry point for Spark functionality. A StreamingContext represents the
+    Main entry point for Spark Streaming functionality. A StreamingContext represents the
     connection to a Spark cluster, and can be used to create L{RDD}s and
     broadcast variables on that cluster.
     """