Fix merge conflict

2017-11-27 15:07:09 +00:00
parent 25d4ac447e bc2b43d815
commit 85ac8e9be7
6 changed files with 206 additions and 5 deletions
--- a/Passwords/Malware/mirai-botnet.txt
+++ b/Passwords/Malware/mirai-botnet.txt
@@ -40,7 +40,7 @@ root hi3518
 root jvbzd
 root anko
 root zlxx.
-root 7ujMko9vizxv
+root 7ujMko0vizxv
 root 7ujMko0admin
 root system
 root ikwb
@@ -58,4 +58,3 @@ admin pass
 admin meinsm
 tech tech
 mother fucker
-