Merge pull request #224 from riverloopsec/bugfix/remove-merge-hash

removed merge hash
riverloopsec · Apr 15, 2021 · cb04e16 · cb04e16
2 parents b7dd750 + 51f1b59
commit cb04e16
Showing 1 changed file with 0 additions and 1 deletion.
diff --git 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 = '[email protected], [email protected]',