Fix conflicts

1 files changed, 2 insertions, 2 deletions

diff --git a/src/displayapp/screens/Meter.cpp b/src/displayapp/screens/Meter.cpp
index c74b8bdf..273e111d 100644
--- a/src/displayapp/screens/Meter.cpp
+++ b/src/displayapp/screens/Meter.cpp
@@ -17,14 +17,14 @@ Meter::Meter(Pinetime::Applications::DisplayApp *app) : Screen(app) {
   style_lmeter.body.padding.left = 16;                           /*Line length*/
 
   /*Create a line meter */
-  lmeter = lv_lmeter_create(lv_scr_act(), NULL);
+  lmeter = lv_lmeter_create(lv_scr_act(), nullptr);
   lv_lmeter_set_range(lmeter, 0, 60);                   /*Set the range*/
   lv_lmeter_set_value(lmeter, value);                       /*Set the current value*/
   lv_lmeter_set_angle_offset(lmeter, 180);
   lv_lmeter_set_scale(lmeter, 360, 60);                  /*Set the angle and number of lines*/
   lv_lmeter_set_style(lmeter, LV_LMETER_STYLE_MAIN, &style_lmeter);           /*Apply the new style*/
   lv_obj_set_size(lmeter, 150, 150);
-  lv_obj_align(lmeter, NULL, LV_ALIGN_CENTER, 0, 0);
+  lv_obj_align(lmeter, nullptr, LV_ALIGN_CENTER, 0, 0);
 
 }