Project import generated by Copybara.

PiperOrigin-RevId: 267280553

mediapipe/framework/stream_handler/fixed_size_input_stream_handler.cc

@@ -108,12 +108,6 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
   }
 
   // Returns the lowest timestamp of a packet ready to process.
-<<<<<<< HEAD
-  Timestamp MinTimestampOrBound() {
-    Timestamp min_bound = Timestamp::Done();
-    for (const auto& stream : input_stream_managers_) {
-      min_bound = std::min(min_bound, stream->MinTimestampOrBound(nullptr));
-=======
   Timestamp MinTimestampToProcess() {
     Timestamp min_bound = Timestamp::Done();
     for (const auto& stream : input_stream_managers_) {
@@ -126,7 +120,6 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
         stream_timestamp = PreviousAllowedInStream(stream_timestamp);
       }
       min_bound = std::min(min_bound, stream_timestamp);
->>>>>>> Project import generated by Copybara.
     }
     return min_bound;
   }
@@ -214,11 +207,7 @@ class FixedSizeInputStreamHandler : public DefaultInputStreamHandler {
     }
     // input_timestamp is recalculated here to process the most recent packets.
     EraseSurplusPackets(true);
-<<<<<<< HEAD
-    input_timestamp = MinTimestampOrBound();
-=======
     input_timestamp = MinTimestampToProcess();
->>>>>>> Project import generated by Copybara.
     DefaultInputStreamHandler::FillInputSet(input_timestamp, input_set);
     pending_ = false;
   }