Skip to content
Commit 249a4536 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

resolve merge conflicts of c55cce48 to master 

Change-Id: If833e3c5efed891fb1ba7b32b2edc96a60ea2566
parents 12e78b45 c55cce48
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