Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c38f5d9 authored by Colin Cross's avatar Colin Cross
Browse files

resolved conflicts for merge of 1fef485f to master 

Change-Id: If402e68292a183064afe35cb77a4437682ee373a
parents fb31448b 1fef485f

healthd/healthd_mode_charger.cpp

+2 −0
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 


#include "healthd.h"



char *locale;



#ifndef max

#define max(a,b) ((a) > (b) ? (a) : (b))

#endif