fix conflict
Change-Id: I298272f356659e1d91972e65222f20a9087abe39
diff --git a/src/main/java/com/example/g8backend/controller/TrackerController.java b/src/main/java/com/example/g8backend/controller/TrackerController.java
index ace7067..84c04ba 100644
--- a/src/main/java/com/example/g8backend/controller/TrackerController.java
+++ b/src/main/java/com/example/g8backend/controller/TrackerController.java
@@ -36,6 +36,9 @@
logger.info("Announce request received: info_hash={}, peer_id={}, port={}, uploaded={}, downloaded={}, event={}, left={}, compact={}, passkey={}",
infoHash, peerId, port, uploaded, downloaded, event, left, compact, passkey);
+ System.out.println("passkey: " + passkey);
+ System.out.println("info_hash: " + infoHash);
+
AnnounceRequestDTO requestDTO = new AnnounceRequestDTO();
requestDTO.setPasskey(passkey);
requestDTO.setInfoHash(infoHash);