old_contents: # Copyright 2016 Autodesk Inc.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  from __future__ import absolute_import
  
  from .exportall import *
  from . import docparsers
  from .callsigs import *
  from .descriptors import *
  from .classes import *
  from .databases import *
  from .utils import *
  from .numerical import *
  <<<<<<< HEAD
  from .json_extension import *
  =======
  
  
  >>>>>>> widgetcleanup
  
new_contents: # Copyright 2016 Autodesk Inc.
  #
  # Licensed under the Apache License, Version 2.0 (the "License");
  # you may not use this file except in compliance with the License.
  # You may obtain a copy of the License at
  #
  #     http://www.apache.org/licenses/LICENSE-2.0
  #
  # Unless required by applicable law or agreed to in writing, software
  # distributed under the License is distributed on an "AS IS" BASIS,
  # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  # See the License for the specific language governing permissions and
  # limitations under the License.
  from __future__ import absolute_import
  
  from .exportall import *
  from . import docparsers
  from .callsigs import *
  from .descriptors import *
  from .classes import *
  from .databases import *
  from .utils import *
  from .numerical import *
  from .json_extension import *
  
subject: Fix merge