partial merge resolution

(#195)
GalSim-developers · Aug 17, 2012 · 5b6a970 · 5b6a970
2 parents 4ce4de5 + 343f6cf
commit 5b6a970
Show file tree

Hide file tree

Showing 6 changed files with 362 additions and 133 deletions.
diff --git a/galsim/__init__.py b/galsim/__init__.py
@@ -6,7 +6,6 @@
 from ellipse import *
 from . import fits
 from base import *
-from . import sandbox
 from . import noise
 from . import atmosphere
 from . import optics