diff options
| author | Ross Burton <ross.burton@intel.com> | 2015-12-17 20:57:01 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-22 16:08:51 +0000 |
| commit | d2b770caade430f584c83806924b962982ab7ddc (patch) | |
| tree | 772081818f5478a713f7f9a25191fddc028a023c /scripts/lib/wic/utils/partitionedfs.py | |
| parent | ca69643faa949664e3d5c3c182cbe2ba1dc55026 (diff) | |
| download | poky-d2b770caade430f584c83806924b962982ab7ddc.tar.gz | |
systemd: remove merge conflicts accidently left in
(From OE-Core rev: 1e49b502e730d51420682aa9b57628ae113fe0b2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/wic/utils/partitionedfs.py')
0 files changed, 0 insertions, 0 deletions