fix conflict name
authorGui Chen <gui.chen@intel.com>
Thu, 5 Dec 2013 02:09:40 +0000 (21:09 -0500)
committerGui Chen <gui.chen@intel.com>
Thu, 5 Dec 2013 02:09:40 +0000 (21:09 -0500)
commitcac3ad8b01f660174bc6ea20e38ed1e7a9d027ce
treefb2713ce126991ab315119b5a0d0780aafc3c7d6
parentcbc7996d85662310691e99e8720d0f55300ae597
fix conflict name

Change-Id: I9f6c08977f91fff458efd7bec754599671e456d5
Signed-off-by: Gui Chen <gui.chen@intel.com>
mic/bootstrap.py