Compare commits

..

No commits in common. "45a9c313df3614862611d4d67368fc582fecb12f" and "0849dd98016ca2a9c5317c44a504154be8a535f0" have entirely different histories.

View File

@ -18,9 +18,6 @@ rustdesk ansible_host=10.0.0.18 ansible_port=22
[server_web]
#192.168.1.116 ansible_user=root ansible_ssh_pass=testtest
<<<<<<< HEAD
5.196.14.69 ansible_user=root ansible_port=2222
=======
#192.168.1.145 ansible_user=root ansible_ssh_pass=testtest
#192.168.1.118 ansible_user=root ansible_ssh_pass=testtest
@ -31,7 +28,6 @@ rustdesk ansible_host=10.0.0.18 ansible_port=22
#192.168.1.14 ansible_user=smauro ansible_port=52190
#192.168.1.10 ansible_user=smauro ansible_port=52190
#192.168.1.145 ansible_user=smauro
>>>>>>> 0849dd98016ca2a9c5317c44a504154be8a535f0
[grafana]
#192.168.1.58 ansible_user=smauro
@ -44,12 +40,8 @@ rustdesk ansible_host=10.0.0.18 ansible_port=22
#192.168.1.248 ansible_user=smauro
#192.168.1.10 ansible_user=smauro ansible_port=52190
#192.168.1.14 ansible_user=smauro ansible_port=52190
<<<<<<< HEAD
5.196.14.69 ansible_user=smauro ansible_port=2222
=======
#192.168.1.57 ansible_user=smauro
#192.168.1.145 ansible_user=smauro
#192.168.1.118 ansible_user=smauro
#192.168.1.78 ansible_user=smauro
192.168.1.61 ansible_user=smauro
>>>>>>> 0849dd98016ca2a9c5317c44a504154be8a535f0