Merge ticket #16132 into #16207 in order to resolve merge conflict. · sagemath/sagetrac-mirror@4aee511 · GitHub

This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Merge ticket #16132 into #16207 in order to resolve merge conflict.

Browse files

Resolved Conflict:
	src/sage/combinat/finite_state_machine.py

Loading branch information

cheuberg committed Apr 22, 2014

2 parents 53a700c + afc15e5 commit 4aee511