From b9692b451eb5c3d6576fa4706b4eac1cf0b0000e Mon Sep 17 00:00:00 2001
From: Rob Glew <rglew@umich.edu>
Date: Mon, 23 Nov 2015 23:15:58 -0600
Subject: [PATCH] Fix setup.py

---
 setup.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/setup.py b/setup.py
index 9591651..83c9537 100755
--- 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
         ]
 )