fix

WWhiteDreamProject · Dec 5, 2024 · fd7f145 · fd7f145
1 parent 8055d6d
commit fd7f145
Showing 1 changed file with 0 additions and 7 deletions.
diff --git a/Content.Shared.Database/LogType.cs b/Content.Shared.Database/LogType.cs
@@ -99,23 +99,16 @@ public enum LogType
     AtmosTemperatureChanged = 88,
     DeviceNetwork = 89,
     StoreRefund = 90,
-<<<<<<< HEAD
-=======
-
->>>>>>> c33644532d (Rate limit ahelps (#29219))
     /// <summary>
     /// User was rate-limited for some spam action.
     /// </summary>
     /// <remarks>
     /// This is a default value used by <c>PlayerRateLimitManager</c>, though users can use different log types.
     /// </remarks>
     RateLimited = 91,
-<<<<<<< HEAD
     // WD EDIT
     AspectAnnounced = 92,
     AspectStarted = 93,
     AspectStopped = 94,
     // WD EDIT
-=======
->>>>>>> c33644532d (Rate limit ahelps (#29219))
 }