Fix merge conflict

This commit is contained in:
g0tmi1k committed 2017-11-27 15:08:43 +00:00
commit 85ac8e9be7
6 files changed
+206 -5

No files matched your search

+1 -2
View File
@@ -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