Fixing unmerged file.

2dc1d648 · fwkz · 3dffcc49 · 2dc1d648
Commit 2dc1d648 authored 9 years ago by fwkz
Hide whitespace changes
Inline Side-by-side

Showing with 1 additions and 6 deletions

__init__.py routersploit/__init__.py +1 -6

No files found.
--- a/routersploit/__init__.py
+++ b/routersploit/__init__.py
 from routersploit.utils import (
-<<<<<<< d4fb4d39165c40b179c139a9d568e5ba87553cc8
-    print_error, print_status, print_success,
-    print_table, print_info, sanitize_url,
-    LockedIterator, random_text,
-=======
    print_error,
    print_status,
    print_success,
@@ -11,8 +6,8 @@ from routersploit.utils import (
    print_info,
    sanitize_url,
    LockedIterator,
+    random_text,
    http_request,
->>>>>>> Adding http_request() idea.
 )
 from routersploit import exploits