perparing for merge

2025-06-21 13:51:16 +03:00
parent f42fc6463c
commit 0fab2c9722
4 changed files with 12 additions and 3 deletions
--- a/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
+++ b/Assets/Fish-Networking-Discovery-main/NetworkDiscovery.cs
@@ -242,7 +242,11 @@ namespace FishNet.Discovery
 			//
 			// 	return;
 			// }
+<<<<<<< HEAD
 			Debug.Log("NetworkDiscovery is searching");
+=======
+			// Debug.Log("NetworkDiscovery is searching on port " + port);
+>>>>>>> master

 			if (InstanceFinder.IsClient)
 			{