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

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

resolve merge conflicts of 1a752ce6 to qt-r1-dev 

Test: I solemnly swear I tested this conflict resolution.
Bug: None
Change-Id: I26f1b5ae67861d1de9f889e7434a7feb965a6fec
parents 54963180 1a752ce6
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