Commit 2ab870ba authored by hengli's avatar hengli

Fixed merge conflict in qgroundcontrol.pro.

parents b4a632b2 821e0e63
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