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

Commit 6c300c89 authored by Tony Wickham's avatar Tony Wickham
Browse files

resolve merge conflicts of 128b7e59 to ub-launcher3-master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I927373593dfb1b67b504a76b1ad013357b363a6e
parents 2dbcfb6c 128b7e59
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