diff options
| author | Matt Wilson <msw@redhat.com> | 2000-01-02 20:52:27 +0000 |
|---|---|---|
| committer | Matt Wilson <msw@redhat.com> | 2000-01-02 20:52:27 +0000 |
| commit | 22ca4ff37438cd454afd1885eb4b75c34bff0658 (patch) | |
| tree | 602dfd816958c98bd7a005788827d08a14a09c69 /isys | |
| parent | 7de9b8ca0ff2a145a3a40f00b182e1f4408b7377 (diff) | |
| download | anaconda-22ca4ff37438cd454afd1885eb4b75c34bff0658.tar.gz anaconda-22ca4ff37438cd454afd1885eb4b75c34bff0658.tar.xz anaconda-22ca4ff37438cd454afd1885eb4b75c34bff0658.zip | |
remove conflicts
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/isys.py | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/isys/isys.py b/isys/isys.py index 957f0fde2..3c43aeff0 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -35,7 +35,6 @@ def raidsb(mdDevice): os.close(fd) return rc ->>>>>>> 1.24 def losetup(device, file): loop = os.open(device, os.O_RDONLY) targ = os.open(file, os.O_RDWR) |