From 7ffe1b4e233860ac662b08f85ff565393d7df0bf Mon Sep 17 00:00:00 2001 From: LetterJay Date: Fri, 27 Oct 2017 23:55:23 -0500 Subject: [PATCH] Update cmp.dm --- code/__HELPERS/cmp.dm | 3 --- 1 file changed, 3 deletions(-) diff --git a/code/__HELPERS/cmp.dm b/code/__HELPERS/cmp.dm index d4ec1651a1..dbb548a6a5 100644 --- a/code/__HELPERS/cmp.dm +++ b/code/__HELPERS/cmp.dm @@ -58,8 +58,6 @@ GLOBAL_VAR_INIT(cmp_field, "name") . = B.failures - A.failures if (!.) . = B.qdels - A.qdels -<<<<<<< HEAD -======= /proc/cmp_profile_avg_time_dsc(list/A, list/B) return (B[PROFILE_ITEM_TIME]/(B[PROFILE_ITEM_COUNT] || 1)) - (A[PROFILE_ITEM_TIME]/(A[PROFILE_ITEM_COUNT] || 1)) @@ -69,4 +67,3 @@ GLOBAL_VAR_INIT(cmp_field, "name") /proc/cmp_profile_count_dsc(list/A, list/B) return B[PROFILE_ITEM_COUNT] - A[PROFILE_ITEM_COUNT] ->>>>>>> bf06d69... Merge pull request #32116 from MrStonedOne/line-by-line-profiling