scripts: Fix small merges

Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
1 file changed
tree: 828610d0e03d3fb9582e84955aa243af1cb4d4a6
  1. changes
  2. common
  3. get-source
  4. lco
  5. settings
  6. update