Fix merge conflict

This commit is contained in:
g0tmi1k
2017-11-27 15:07:09 +00:00
6 changed files with 206 additions and 5 deletions

View File

@@ -1,4 +1,5 @@
Vendor,Username,Password,Comments
<N/A>,<N/A>,H4!b5at+kWls-8yh4Guq,Troll from: https://mostsecure.pw/
"2Wire, Inc.",http,<BLANK>,
360 Systems,factory,factory,
3COM,3comcso,RIP000,Resets all passwords to defaults
@@ -564,6 +565,7 @@ Cisco,uwmadmin,password,http://www.cisco.com/c/en/us/td/docs/cloud_services/cisc
Cisco,wlse,wlsedb,
Cisco,wlseuser,wlsepassword,
Cisco-Arrowpoint,admin,system,
Cisco-Ironport,admin,ironport,
Citel,<BLANK>,citel,
Citel,citel,password,
"Citrix Systems, Inc.",nsroot,nsroot,http://support.citrix.com/proddocs/topic/access-gateway-hig-appliances/ag-using-setup-wizard-tsk.html
1 Vendor Username Password Comments
2 <N/A> <N/A> H4!b5at+kWls-8yh4Guq Troll from: https://mostsecure.pw/
3 2Wire, Inc. http <BLANK>
4 360 Systems factory factory
5 3COM 3comcso RIP000 Resets all passwords to defaults
565 Cisco wlse wlsedb
566 Cisco wlseuser wlsepassword
567 Cisco-Arrowpoint admin system
568 Cisco-Ironport admin ironport
569 Citel <BLANK> citel
570 Citel citel password
571 Citrix Systems, Inc. nsroot nsroot http://support.citrix.com/proddocs/topic/access-gateway-hig-appliances/ag-using-setup-wizard-tsk.html

View File

@@ -4061,7 +4061,4 @@ lolol123
hello2
hooligan1
joker666
hielox
<<<<<<< HEAD
=======
hielox

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