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

Skip to content
Commit 8f01bc67 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

resolve merge conflicts of a9d17da6 to ub-deskclock-huddle 

Change-Id: Ia0f103336b3c3c7e294d93d5cfc232ab3ff32ce4
parents 7e1f9d61 a9d17da6
Hide 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