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

Skip to content
Commit 62328d85 authored by Anton Hansson's avatar Anton Hansson
Browse files

Disallow use of error-prone merge-strategies 

Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
parent d6a7f164
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