c12cf2bc59c5b952f3279ffeb068d7723344d0fb

Solved building and merge conflict problem. Signed-off-by: egoncalv <elisamaraaoki.goncalves@windriver.com> Change-Id: I9272fa6246bd60ace6a5f7ba64fdb4181b1e4721
StarlingX documentation
This repository contains base documentation for the StarlingX project.
Description
Languages
Python
68.2%
Shell
31.8%