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

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

resolve merge conflicts of 270e0e33 to ub-deskclock-fantasy 

Change-Id: I46701d5f4b60b3856f77ffde5c2ef588ea9f7245
parents 427c5a6b 270e0e33
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment