diff options
author | Matt Wilson <msw@redhat.com> | 2000-01-02 20:24:03 +0000 |
---|---|---|
committer | Matt Wilson <msw@redhat.com> | 2000-01-02 20:24:03 +0000 |
commit | 3247652a49b657a729d84b3eade363a7d303243a (patch) | |
tree | bb5bf8a8f3be4861c78f1cf4c405c2126a236c9c /isys | |
parent | bbf4c2ef8efc8504e3584ad39e2e294536ccc481 (diff) | |
download | anaconda-3247652a49b657a729d84b3eade363a7d303243a.tar.gz anaconda-3247652a49b657a729d84b3eade363a7d303243a.tar.xz anaconda-3247652a49b657a729d84b3eade363a7d303243a.zip |
remove conflicts
Diffstat (limited to 'isys')
-rw-r--r-- | isys/isys.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/isys/isys.c b/isys/isys.c index b4c612fc2..3847a1fad 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -48,20 +48,14 @@ static PyObject * doLoSetup(PyObject * s, PyObject * args); static PyObject * doUnLoSetup(PyObject * s, PyObject * args); static PyObject * doDdFile(PyObject * s, PyObject * args); static PyObject * doGetRaidSuperblock(PyObject * s, PyObject * args); -<<<<<<< isys.c static PyObject * doDevSpaceFree(PyObject * s, PyObject * args); -======= static PyObject * doRaidStart(PyObject * s, PyObject * args); static PyObject * doRaidStop(PyObject * s, PyObject * args); ->>>>>>> 1.30 static PyMethodDef isysModuleMethods[] = { -<<<<<<< isys.c { "devSpaceFree", (PyCFunction) doDevSpaceFree, METH_VARARGS, NULL }, -======= { "raidstop", (PyCFunction) doRaidStop, METH_VARARGS, NULL }, { "raidstart", (PyCFunction) doRaidStart, METH_VARARGS, NULL }, ->>>>>>> 1.30 { "getraidsb", (PyCFunction) doGetRaidSuperblock, METH_VARARGS, NULL }, { "losetup", (PyCFunction) doLoSetup, METH_VARARGS, NULL }, { "unlosetup", (PyCFunction) doUnLoSetup, METH_VARARGS, NULL }, |