fix merge conflict

This commit is contained in:
Harlow Ward 2019-02-18 10:30:37 -08:00
parent 4bc414e216
commit 27f13ed3fc

View file

@ -225,9 +225,9 @@ func (c *Consumer) getShardIterator(streamName, shardID, seqNum string) (*string
StreamName: aws.String(streamName), StreamName: aws.String(streamName),
} }
if lastSeqNum != "" { if seqNum != "" {
params.ShardIteratorType = aws.String(kinesis.ShardIteratorTypeAfterSequenceNumber) params.ShardIteratorType = aws.String(kinesis.ShardIteratorTypeAfterSequenceNumber)
params.StartingSequenceNumber = aws.String(lastSeqNum) params.StartingSequenceNumber = aws.String(seqNum)
} else { } else {
params.ShardIteratorType = aws.String(c.initialShardIteratorType) params.ShardIteratorType = aws.String(c.initialShardIteratorType)
} }