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

Commit 376b0f51 authored by James Lemieux's avatar James Lemieux
Browse files

resolve merge conflicts of ac1506f1 to ub-deskclock-escargatoire. 

Change-Id: Iac75ebf83671a3f4dd18a926f7f90923e5f4af15
parents 74581ce7 ac1506f1
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment