Updated Doc updates for consistent region

IBMStreams · Feb 17, 2015 · f929d95 · f929d95
1 parent a8c2d3c
commit f929d95
Showing 1 changed file with 1 addition and 2 deletions.
diff --git a/com.ibm.streamsx.hdfs/com.ibm.streamsx.hdfs/HDFS2FileSource/HDFS2FileSource.xml b/com.ibm.streamsx.hdfs/com.ibm.streamsx.hdfs/HDFS2FileSource/HDFS2FileSource.xml
@@ -26,8 +26,7 @@ At checkpoint, the operator saves the current file name and file cursor location
 If the operator does not have an input port, upon application failures, the operator resets
 the file cursor back to the checkpointed location, and starts replaying tuples from the cursor location.
 If the operator has an input port and is in a consistent region, the operator relies on its upstream operators
-to properly reply the filenames for it to re-read the files from the beginning.
->>>>>>> 6214077756b540eb86756047b2a42c1a1e9ff684
+to properly reply the filenames for it to re-read the files from the beginning.
 
 # Exceptions