1. Ronald Oussoren
  2. pyobjc

Commits

Ronald Oussoren  committed 639b4fd

Remove conflict marker

Fixes issue #53

  • Participants
  • Parent commits 6da7149
  • Branches default

Comments (0)

Files changed (1)

File pyobjc-framework-AppleScriptKit/setup.py

View file
  • Ignore whitespace
 
 setup(
     name='pyobjc-framework-AppleScriptKit',
-<<<<<<< local
     version="2.6b1",
     description = "Wrappers for the framework AppleScriptKit on Mac OS X",
     packages = [ "AppleScriptKit" ],