Fix setup.py

9 years ago · b9692b451e
parent 411fa9a90b
commit b9692b451e
1 changed files with 0 additions and 4 deletions
--- a/setup.py
+++ b/setup.py
@ -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
        ]
 )