tree 146d79f84347053dce9d2635dd18ae06b973651e
parent aa4196f2b6469b5ac9b0055c59e0555d32b76359
author Thomas Vachuska <tom@onlab.us> 1444959113 -0700
committer Thomas Vachuska <tom@onlab.us> 1444959113 -0700

Fixed a bad merge in UI archetype.

Change-Id: Ifca70a076d7c16336ba692073ec08477300292bd