Resolve merge conflicts, merge #229 "Add SystemdMeter" from @cgzones

1 files changed, 2 insertions, 1 deletions

diff --git a/CRT.h b/CRT.h
index fccf65c1..ed9cbf42 100644
--- a/CRT.h
+++ b/CRT.h
@@ -53,9 +53,10 @@ typedef enum ColorElements_ {
    METER_TEXT,
    METER_VALUE,
    METER_VALUE_ERROR,
-   METER_VALUE_NOTICE,
    METER_VALUE_IOREAD,
    METER_VALUE_IOWRITE,
+   METER_VALUE_NOTICE,
+   METER_VALUE_OK,
    LED_COLOR,
    UPTIME,
    BATTERY,