Skip to content

Commit

Permalink
Fixed merged conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
mondain committed Nov 26, 2021
1 parent c29ba56 commit 762def7
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 7 deletions.
3 changes: 0 additions & 3 deletions src/main/java/org/red5/server/net/rtmp/RTMPConnection.java
Original file line number Diff line number Diff line change
Expand Up @@ -559,10 +559,7 @@ private void startRoundTripMeasurement() {
}
}
} else {
<<<<<<< HEAD
=======
// reducing from error to debug as its not all that important of a message these days to have such promotion
>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
log.debug("startRoundTripMeasurement cannot be executed due to missing scheduler. This can happen if a connection drops before handshake is complete");
}
}
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/org/red5/server/net/rtmp/RTMPHandler.java
Original file line number Diff line number Diff line change
Expand Up @@ -539,13 +539,9 @@ protected void onPing(RTMPConnection conn, Channel channel, Header source, Ping
conn.pingReceived(ping);
break;
default:
<<<<<<< HEAD
if (isDebug) {
log.warn("Unhandled ping: {}", ping);
}
=======
log.debug("Unhandled ping: {}", ping);
>>>>>>> f78354776c35ad921077113bd88a00cdd7e951d8
}
}

Expand Down

0 comments on commit 762def7

Please sign in to comment.