tree 1f158f192539336785d2a3c1fb17597cd30c9773
parent f254ba77a5abf5a806efb35055b5e0d4ced40251
author Ed Tanous <ed.tanous@intel.com> 1539367877 -0700
committer Ed Tanous <ed.tanous@intel.com> 1539710110 +0000

Fix merge conflict, and enable SOL

A merge conflict caused the SOL websocket code to get removed from
master.  This resolves the merge conflict, and reenables SOL in bmcweb.

Tested By: Launched SOL console in phosphor-webui, and observed
appropriate behavior.

Change-Id: I88116fdfb488b6c41aa859e4904b38e918111d04