**diff options**

author | Michele Borassi <michele.borassi@imtlucca.it> | 2015-08-07 11:01:36 +0200 |
---|---|---|

committer | Michele Borassi <michele.borassi@imtlucca.it> | 2015-08-07 11:01:36 +0200 |

commit | 655943e1481a7f80fc60f9f26529c8a7c1e64216 (patch) | |

tree | ead3b0a8da8eae6b644473a8b62ecc78d6ad5e80 | |

parent | Merged with beta1 (diff) |

Corrected merge error

-rw-r--r-- | src/sage/graphs/digraph.py | 3 | ||||

-rw-r--r-- | src/sage/graphs/graph.py | 3 |

2 files changed, 0 insertions, 6 deletions

diff --git a/src/sage/graphs/digraph.py b/src/sage/graphs/digraph.py index a1f9f71..56dfd3a 100644 --- a/src/sage/graphs/digraph.py +++ b/src/sage/graphs/digraph.py @@ -256,9 +256,6 @@ class DiGraph(GenericGraph): - ``igraph`` - data must be an igraph directed Graph. - - ``boundary`` - a list of boundary vertices, if - empty, digraph is considered as a 'graph without boundary' - - ``sparse`` (boolean) -- ``sparse=True`` is an alias for ``data_structure="sparse"``, and ``sparse=False`` is an alias for ``data_structure="dense"``. diff --git a/src/sage/graphs/graph.py b/src/sage/graphs/graph.py index 59f9a12..12b90b8 100644 --- a/src/sage/graphs/graph.py +++ b/src/sage/graphs/graph.py @@ -699,9 +699,6 @@ class Graph(GenericGraph): - ``igraph`` - data must be an `igraph <http://igraph.org/>`__ graph. - - ``boundary`` - a list of boundary vertices, if - empty, graph is considered as a 'graph without boundary' - - ``sparse`` (boolean) -- ``sparse=True`` is an alias for ``data_structure="sparse"``, and ``sparse=False`` is an alias for ``data_structure="dense"``. |