committing merge? Thought I just did this.

etjones-erisyon · etjones-erisyon · commit 9190617020ea · 2014-01-16T19:22:17.000-08:00
diff --git a/solid/solidpython.py b/solid/solidpython.py
@@ -624,18 +624,12 @@ def new_openscad_class_str( class_name, args=[], kwargs=[], include_file_path=No
         args_pairs += "'%(kwarg)s':%(kwarg)s, "%vars()
     
     if include_file_path:
-<<<<<<< .merge_file_IIbKi0
-        result = ("class %(class_name)s( included_openscad_object):\n"
-        "   def __init__(self%(args_str)s, **kwargs):\n"
-        "       included_openscad_object.__init__(self, '%(class_name)s', {%(args_pairs)s }, include_file_path='%(include_file_path)s', use_not_include=%(use_not_include)s, **kwargs )\n"
-=======
         # NOTE the explicit import of 'solid' below. This is a fix for:
         # https://github.com/SolidCode/SolidPython/issues/20 -ETJ 16 Jan 2014
         result = ("import solid\n"
         "class %(class_name)s( solid.included_openscad_object):\n"
-        "   def __init__(self%(args_str)s):\n"
-        "       solid.included_openscad_object.__init__(self, '%(class_name)s', {%(args_pairs)s }, include_file_path='%(include_file_path)s', use_not_include=%(use_not_include)s )\n"
->>>>>>> .merge_file_wxmPLA
+        "   def __init__(self%(args_str)s, **kwargs):\n"
+        "       solid.included_openscad_object.__init__(self, '%(class_name)s', {%(args_pairs)s }, include_file_path='%(include_file_path)s', use_not_include=%(use_not_include)s, **kwargs )\n"
         "   \n"
         "\n"%vars())
     else:
