From 51f1b59315d248052c9aa7ea418b4a29d12f208a Mon Sep 17 00:00:00 2001
From: Taylor <taylor@Taylors-MacBook-Pro.local>
Date: Thu, 15 Apr 2021 10:34:47 -0400
Subject: [PATCH] removed merge hash

---
 setup.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/setup.py b/setup.py
index 68eabb1..41e0aa5 100644
--- a/setup.py
+++ b/setup.py
@@ -81,7 +81,6 @@
 
 setup(name        = 'killerbee',
       version     = '3.0.0-beta.0',
->>>>>>> d38be5fe20e4d9b0de881cac4aa14b7656e8f5c0
       description = 'ZigBee and IEEE 802.15.4 Attack Framework and Tools',
       author = 'Joshua Wright, Ryan Speers',
       author_email = 'jwright@willhackforsushi.com, ryan@riverloopsecurity.com',