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

Commit 309335e7 authored by Benoit Lamarche's avatar Benoit Lamarche
Browse files

resolve merge conflicts of 57fb5872 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: Icc3fa0cd65fd6cd952008bdd068d527e20c81ae8
parents 20041c2d 57fb5872
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