Commit f3bec848 authored by Alan Alpert's avatar Alan Alpert Committed by Qt by Nokia

Fix failed rebase

Change-Id: I5d6c6bb50baaa4c1ba986de779bad04ba45947fa
Reviewed-by: default avatarFrederik Gladhorn <frederik.gladhorn@nokia.com>
parent 37bd02ab
Markdown is supported
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