modified the code base on comment in tdas#10

Ken Takagiwa · giwa · commit 17a74c629840 · 2014-09-20T18:47:06.000+09:00
diff --git 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
@@ -1 +0,0 @@
-__author__ = 'ktakagiw'
diff --git 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.
     """
