tree ff2777849b36df8c7cea20206747d8a00376bf34
parent 7ee83b3e440278d8bc5ce41896c357526f8f0112
parent e41c16ed14c4c8f654dd22d0a50eb11a55342c4f
author Masayoshi Kobayashi <masayoshi@onlab.us> 1371772360 -0700
committer Masayoshi Kobayashi <masayoshi@onlab.us> 1371772360 -0700

resolved conflict in start-onos.sh and start-onos-embedded.sh