From 826395fb5bfa055e211ed297c55744981063bd13 Mon Sep 17 00:00:00 2001
From: Shlomi Fish <shlomif@shlomifish.org>
Date: Wed, 12 Dec 2012 16:52:15 +0200
Subject: [PATCH] Add more.

---
 pysollib/stack.py | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/pysollib/stack.py b/pysollib/stack.py
index 02ca7fcb..4e5ae6f5 100644
--- a/pysollib/stack.py
+++ b/pysollib/stack.py
@@ -109,14 +109,8 @@ from pysollib.pysoltk import after, after_idle, after_cancel
 from pysollib.pysoltk import MfxCanvasGroup, MfxCanvasImage, MfxCanvasRectangle, MfxCanvasText, MfxCanvasLine
 from pysollib.pysoltk import get_text_width
 from pysollib.pysoltk import markImage
-<<<<<<< HEAD
-from settings import TOOLKIT
-from settings import DEBUG
-
-=======
 from pysollib.settings import TOOLKIT
 from pysollib.settings import DEBUG
->>>>>>> solver_dialog_remove_so_called_solving_method
 
 # ************************************************************************
 # * Let's start with some test methods for cards.