modified the code base on comment in tdas#10

Author: Ken Takagiwa

core/pom.xml

@@ -21,7 +21,11 @@
   <parent>
     <groupId>org.apache.spark</groupId>
     <artifactId>spark-parent</artifactId>
+<<<<<<< HEAD
     <version>1.2.0-SNAPSHOT</version>
+=======
+    <version>1.1.0-SNAPSHOT</version>
+>>>>>>> modified the code base on comment in https://github.com/tdas/spark/pull/10
     <relativePath>../pom.xml</relativePath>
   </parent>
 

python/pyspark/streaming/__init__.py

@@ -1 +0,0 @@
-__author__ = 'ktakagiw'