Работай

Corvax-Frontier · Apr 23, 2024 · 540b8a6 · 540b8a6
1 parent 09928ad
commit 540b8a6
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/Content.Server/Connection/ConnectionManager.cs b/Content.Server/Connection/ConnectionManager.cs
@@ -49,7 +49,6 @@ public sealed class ConnectionManager : IConnectionManager
         [Dependency] private readonly ServerDbEntryManager _serverDbEntry = default!;
         [Dependency] private readonly IGameTiming _gameTiming = default!;
         [Dependency] private readonly ILogManager _logManager = default!;
-<<<<<<< HEAD
         private IServerSponsorsManager? _sponsorsMgr; // Corvax-Sponsors
 
         private readonly Dictionary<NetUserId, TimeSpan> _temporaryBypasses = [];