modified the code base on comment in tdas#10

tresata-opensource · Sep 20, 2014 · 247fd74 · 247fd74
1 parent 4bcb318
commit 247fd74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/core/pom.xml b/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>
 

diff --git a/python/pyspark/streaming/__init__.py b/python/pyspark/streaming/__init__.py
@@ -1 +0,0 @@
-__author__ = 'ktakagiw'