Source

pyobjc / pyobjc-framework-AppleScriptKit / setup.py

Diff from to

File pyobjc-framework-AppleScriptKit/setup.py

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