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

Skip to content
Commit cd75c121 authored by James Lemieux's avatar James Lemieux
Browse files

resolved conflicts for merge of 5407d5c3 to ub-deskclock-charm 

Change-Id: I069373d9859bc3f7dea5a9e3f1a939e6bdc6753a
parents a0d3da4e 5407d5c3
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