Commit af37332
committed
dash(slice1): web_server 3-way reconcile onto master SSOT base
master already absorbed the embedded web_server work via the S5/S6 slice
campaign (hpp byte-identical; cpp diverged only on the coin-node seam API).
Resolve the seam to master SSOT (set_coin_node/ICoinNode), and re-apply the
one genuinely-additive embedded-only hunk (share_version per blockchain).
Compiling base for the embedded S7/S8 source slices to land on.1 parent 81fef6a commit af37332
1 file changed
Lines changed: 11 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
4709 | 4709 | | |
4710 | 4710 | | |
4711 | 4711 | | |
| 4712 | + | |
| 4713 | + | |
| 4714 | + | |
| 4715 | + | |
| 4716 | + | |
| 4717 | + | |
| 4718 | + | |
| 4719 | + | |
| 4720 | + | |
| 4721 | + | |
| 4722 | + | |
4712 | 4723 | | |
4713 | 4724 | | |
4714 | 4725 | | |
| |||
0 commit comments