diff options
| author | Jordan Bayles <jophba@chromium.org> | 2021-06-29 03:59:26 -0700 |
|---|---|---|
| committer | Jordan Bayles <jophba@chromium.org> | 2021-06-29 16:38:38 +0000 |
| commit | 8a7173ad36859154874c17b107b450ee261a3697 (patch) | |
| tree | 3a1b03b94b0e6c8fced9c18d1f01b883b8025a92 /cast/sender | |
| parent | 12857d42aeff125c69488ef3554f92c4951f2358 (diff) | |
| download | openscreen-8a7173ad36859154874c17b107b450ee261a3697.tar.gz | |
[Cast] Fix merge conflict
An incorrect merge resolution causes a compile error on some compilers.
This patch is a simple fix for the standalone sender build.
Change-Id: I2673386434a7bdbee553b75dc52adf8610ce7137
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2994462
Reviewed-by: Ryan Keane <rwkeane@google.com>
Diffstat (limited to 'cast/sender')
0 files changed, 0 insertions, 0 deletions