diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-02 17:52:51 +0200 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-08-02 17:52:51 +0200 |
| commit | f2a66d4c16d19e671dc0a39956c08de2852e42a3 (patch) | |
| tree | 6c5e1ead745e5276ddd62a584df6ed27e23a30f9 /pkgs/development/python-modules/httpserver | |
| parent | b0d748e244df6c977b2a1db3873ffdc271e59615 (diff) | |
criu: fix merge fail
d020caa5b2eca90ea051403fbb4c52b99ee071b9 vs. e3d0fe898bb0451b2485ccc0be42354614f4fba3
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions