old_contents: """
  _version
  Version information for dnutils.
  """
  import sys
  
  __all__ = [
      'VERSION_MAJOR',
      'VERSION_MINOR',
      'VERSION_PATCH',
      'VERSION_STRING',
      '__version__',
  ]
  
  VERSION_MAJOR = 0
  VERSION_MINOR = 2
  VERSION_PATCH = 11
  
  VERSION_STRING_FULL = '%s.%s.%s' % (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
  VERSION_STRING_SHORT = '%s.%s' % (VERSION_MAJOR, VERSION_MINOR)
  
  __version__ = VERSION_STRING_FULL
  
  if sys.version_info[0] == 2:
      __basedir__ = 'python2.7'
  elif sys.version_info[0] == 3:
      __basedir__ = 'python3.5'
  else:
      raise Exception('Unsupported Python version: %s' % sys.version_info[0])
  
new_contents: """
  _version
  Version information for dnutils.
  """
  import sys
  
  __all__ = [
      'VERSION_MAJOR',
      'VERSION_MINOR',
      'VERSION_PATCH',
      'VERSION_STRING_FULL',
      'VERSION_STRING_SHORT',
      '__version__',
  ]
  
  VERSION_MAJOR = 0
  VERSION_MINOR = 2
  VERSION_PATCH = 11
  
  VERSION_STRING_FULL = '%s.%s.%s' % (VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH)
  VERSION_STRING_SHORT = '%s.%s' % (VERSION_MAJOR, VERSION_MINOR)
  
  __version__ = VERSION_STRING_FULL
  
  if sys.version_info[0] == 2:
      __basedir__ = 'python2.7'
  elif sys.version_info[0] == 3:
      __basedir__ = 'python3.5'
  else:
      raise Exception('Unsupported Python version: %s' % sys.version_info[0])
  
subject: merge conflicts.