jab2870/PappyProxy
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix setup.py

Browse source
This commit is contained in:
Rob Glew 2015-11-23 23:15:58 -06:00
parent 411fa9a90b
commit b9692b451e
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -35,9 +35,5 @@ setup(name='pappyproxy',
'Programming Language :: Python :: 2.7',
'License :: OSI Approved :: MIT License',
'Topic :: Security',
<<<<<<< HEAD
'Topic :: Security :: Pwning Ur Mum',
=======
>>>>>>> master
]
)