diff options
| author | Ed Tanous <ed@tanous.net> | 2024-04-30 02:49:51 +0300 |
|---|---|---|
| committer | Ed Tanous <ed@tanous.net> | 2024-04-30 17:50:54 +0300 |
| commit | ccb05564803b01c16387ac604394afb8207cea3b (patch) | |
| tree | 7ae074c55c5b2ca3f3c5a46648b279c371d499f4 /include/obmc_console.hpp | |
| parent | e4b32753a7ce7ca436bf751f390ee01f02b9efd5 (diff) | |
| download | bmcweb-ccb05564803b01c16387ac604394afb8207cea3b.tar.xz | |
Fix bad merge conflict
nbd proxy and vm websocket options got reversed in
36c0f2a35e670a4b798b7b42fd18455085e9d9c0
Change them back.
Change-Id: I7c54e66f88aee956bd20f2139d110e64998a4ef5
Signed-off-by: Ed Tanous <ed@tanous.net>
Diffstat (limited to 'include/obmc_console.hpp')
0 files changed, 0 insertions, 0 deletions