Skip to content

Commit 762def7

Browse files
committed
Fixed merged conflicts
1 parent c29ba56 commit 762def7

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

src/main/java/org/red5/server/net/rtmp/RTMPConnection.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -559,10 +559,7 @@ private void startRoundTripMeasurement() {
559559
}
560560
}
561561
} else {
562-
<<<<<<< HEAD
563-
=======
564562
// reducing from error to debug as its not all that important of a message these days to have such promotion
565-
>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
566563
log.debug("startRoundTripMeasurement cannot be executed due to missing scheduler. This can happen if a connection drops before handshake is complete");
567564
}
568565
}

src/main/java/org/red5/server/net/rtmp/RTMPHandler.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -539,13 +539,9 @@ protected void onPing(RTMPConnection conn, Channel channel, Header source, Ping
539539
conn.pingReceived(ping);
540540
break;
541541
default:
542-
<<<<<<< HEAD
543542
if (isDebug) {
544543
log.warn("Unhandled ping: {}", ping);
545544
}
546-
=======
547-
log.debug("Unhandled ping: {}", ping);
548-
>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
549545
}
550546
}
551547

0 commit comments

Comments
 (0)