added stop in StreamingContext

markhamstra · Sep 20, 2014 · 0b09cff · 0b09cff
1 parent 92e333e
commit 0b09cff
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/python/pyspark/streaming/context.py b/python/pyspark/streaming/context.py
@@ -17,11 +17,7 @@
 
 import sys
 from signal import signal, SIGTERM, SIGINT
-<<<<<<< HEAD
 
-import time
-=======
->>>>>>> Kill py4j callback server properly
 
 from pyspark.conf import SparkConf
 from pyspark.files import SparkFiles