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)
 			{
--- a/Assets/Prefabs.meta
+++ b/Assets/Prefabs.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Prefabs.meta
 guid: f5d758e3acccf474babdbe217a2702ba
+========
+guid: b75b31ee55930864c993630f33293a65
+>>>>>>>> master:Assets/_PROJECT/Components/Bolt.meta
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/Scripts.meta
+++ b/Assets/Scripts.meta
@@ -1,5 +1,9 @@
 fileFormatVersion: 2
+<<<<<<<< HEAD:Assets/Scripts.meta
 guid: 8f19a044f4ee30042a6ad8c58d595f40
+========
+guid: d130522c3b40916429cacacf79ffbc9b
+>>>>>>>> master:Assets/_PROJECT/Components/Bolt/Intercation Logic.meta
 folderAsset: yes
 DefaultImporter:
  externalObjects: {}
--- a/Assets/XR/Settings/OpenXR
+++ b/Assets/XR/Settings/OpenXR