3b7ba0c432
A few trivial conflicts came up. No semantic changes. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> |
||
---|---|---|
.. | ||
0001-libpod-Add-pasta-networking-mode.patch |
3b7ba0c432
A few trivial conflicts came up. No semantic changes. Signed-off-by: Stefano Brivio <sbrivio@redhat.com> |
||
---|---|---|
.. | ||
0001-libpod-Add-pasta-networking-mode.patch |