anthonycicc/PySolFC
1
0
Fork 0
mirror of https://github.com/shlomif/PySolFC.git synced 2025-04-05 00:02:29 -04:00
Code Releases Activity

Remove conflict lines.

Browse source
This commit is contained in:
Shlomi Fish 2012-12-12 16:51:42 +02:00
parent ce7a34ba5a
commit b19f75b20f
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pysollib/main.py
View file

@ -44,10 +44,7 @@ from pysollib.pysoltk import loadImage
from pysollib.pysoltk import MfxMessageDialog
from pysollib.pysoltk import MfxRoot
from pysollib.pysoltk import PysolProgressBar
<<<<<<< HEAD
=======
>>>>>>> solver_dialog_remove_so_called_solving_method
# ************************************************************************
# *