diff options
| author | Ed Tanous <ed.tanous@intel.com> | 2018-10-12 21:11:17 +0300 |
|---|---|---|
| committer | Ed Tanous <ed.tanous@intel.com> | 2018-10-16 20:15:10 +0300 |
| commit | 7729513460a448df44993c2e3a1b6f4b605d19af (patch) | |
| tree | 1f158f192539336785d2a3c1fb17597cd30c9773 /include/webassets.hpp | |
| parent | f254ba77a5abf5a806efb35055b5e0d4ced40251 (diff) | |
| download | bmcweb-7729513460a448df44993c2e3a1b6f4b605d19af.tar.xz | |
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
Diffstat (limited to 'include/webassets.hpp')
0 files changed, 0 insertions, 0 deletions