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

Skip to content
Commit 54963180 authored by Stanislav Zholnin's avatar Stanislav Zholnin
Browse files

resolve merge conflicts of 6943a039 to qt-r1-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: Ib27be056036a9e3520ccfda5f35471359889d5a6
parents 3ccd2f08 6943a039
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