From b19f75b20f5b3a9325d31aa46954171468856282 Mon Sep 17 00:00:00 2001 From: Shlomi Fish Date: Wed, 12 Dec 2012 16:51:42 +0200 Subject: [PATCH] Remove conflict lines. --- pysollib/main.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/pysollib/main.py b/pysollib/main.py index b4dc8233..0e7b9192 100644 --- a/pysollib/main.py +++ b/pysollib/main.py @@ -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 # ************************************************************************ # *