Fix merge conflict.
[iotivity.git] / .gbs.conf
1 [general]
2 upstream_branch = upstream
3 upstream_tag = ${upstreamversion}
4