From cbb8d36187727fe6f8d4532e3f3b6e58aacab938 Mon Sep 17 00:00:00 2001 From: Maddie Cain Date: Wed, 27 Mar 2019 21:59:05 -0400 Subject: [PATCH] fixed merge conflict --- CDTools/tools/__init__.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/CDTools/tools/__init__.py b/CDTools/tools/__init__.py index a8eacbe..6ea3699 100644 --- a/CDTools/tools/__init__.py +++ b/CDTools/tools/__init__.py @@ -3,11 +3,8 @@ from __future__ import division, print_function, absolute_import from CDTools.tools import cmath from CDTools.tools import losses from CDTools.tools import data -<<<<<<< HEAD from CDTools.tools import image_processing from CDTools.tools import initializers from CDTools.tools import losses from CDTools.tools import projectors from CDTools.tools import propagators -======= ->>>>>>> bad75422717fd0eecfe1a136fddc2b96828a3321