From 93f05b459fda8b490971a28436865c74baafed86 Mon Sep 17 00:00:00 2001 From: "Martin \"eto\" Misuth" Date: Tue, 6 Oct 2015 20:05:55 +0200 Subject: [PATCH] fixed broken merge, where I forgot to check linux/Platform.c so that it matches upstream --- linux/Platform.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/linux/Platform.c b/linux/Platform.c index 92ca64c4..32f73893 100644 --- a/linux/Platform.c +++ b/linux/Platform.c @@ -32,11 +32,6 @@ in the source distribution for its full text. #include "BatteryMeter.h" #include "LinuxProcess.h" #include "SignalsPanel.h" - -#ifndef DEFAULT_SIGNAL -#define DEFAULT_SIGNAL 16 -#endif - }*/ ProcessField Platform_defaultFields[] = { PID, USER, PRIORITY, NICE, M_SIZE, M_RESIDENT, M_SHARE, STATE, PERCENT_CPU, PERCENT_MEM, TIME, COMM, 0 };