Skip to content

Commit 242c0f7

Browse files
Update module_interpreter.py
1 parent a879ff9 commit 242c0f7

File tree

1 file changed

+0
-3
lines changed

1 file changed

+0
-3
lines changed

core/module_interpreter.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,8 @@ def listCompleter(text,state):
2828

2929
self.listCompleter = listCompleter
3030
t = tabCompleter()
31-
<<<<<<< HEAD
3231
t.createListCompleter(["set", "exploit", "back", "check", "help", "info", 'banner', 'run', 'exec', 'clear','search'])
33-
=======
3432
t.createListCompleter(["set", "exploit", "back", "check", "help", "info", 'banner', 'run', 'exec','clear'])
35-
>>>>>>> bec4e46061970e58833d21ccdfe8793e5457c876
3633
readline.set_completer_delims('\t')
3734
readline.parse_and_bind("tab: complete")
3835
readline.set_completer(t.listCompleter)

0 commit comments

Comments
 (0)