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

Skip to content
Commit bb99cb3e authored by Selim Cinek's avatar Selim Cinek
Browse files

resolve merge conflicts of c08a4026 to master 

Test: I solemnly swear I tested this conflict resolution.
Change-Id: I4acedef91b60b76d5e8f07d15ed92325a9d6c8b1
parents b2f96a0b c08a4026
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment