Skip to content
Commit b4a632b2 authored by hengli's avatar hengli
Browse files

Fixed merge conflict in qgroundcontrol.pro.

parent f2e26de6
Show 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