I am an idiot

Gallopsled · Aug 22, 2016 · fcf2842 · fcf2842
1 parent 422dccd
commit fcf2842
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/setup.py b/setup.py
@@ -79,11 +79,7 @@
     author               = "Gallopsled et al.",
     author_email         = "#pwntools @ freenode.net",
     url                  = 'https://pwntools.com',
-<<<<<<< HEAD
-    download_url         = "https://pwntools.com/tarball/dev",
-=======
     download_url         = "https://github.com/Gallopsled/pwntools/releases",
->>>>>>> beta
     install_requires     = install_requires,
     license              = "Mostly MIT, some GPL/BSD, see LICENSE-pwntools.txt",
     classifiers          = [