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

Commit 6d27c697 authored by James Lemieux's avatar James Lemieux
Browse files

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

Change-Id: I971070ae6e9ae49cec63f4fc77bda993c6c1277d
parent 28489f44
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