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

Skip to content
Commit f945f521 authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

resolve merge conflicts of 23f196f3 to master 

Test: I solemnly swear I tested this conflict resolution.

Change-Id: I7cd3c310c4ac1187ebfcbc12c8f82cdd33ff9328
parents 77de9dee 23f196f3
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