FIX: Fixing broken rebase :D

Ansible/example_secrets.yml

@@ -1,2 +1,7 @@
 # Copy this into secrets.yml and replate with a real values
 ansible_password: 'REPLACE_WITH_ROOT_PASSWORD'
+# Zabbix proxy parameters for connecting to Zabbix server
+zabbix_server_address: 'x.x.x.x'
+zabbix_psk_identity: '<zabbix_psk_identity'
+zabbix_proxy_hostname: '<zabbix_proxy_hostname>' # if needed, in the actual playbook it is set to the hostname of the target
+zabbix_proxy_psk: 'REPLACE_WITH_ZABBIX_PSK'

Docker/semaphore-ui/.env.example

@@ -1,4 +1,11 @@
+<<<<<<< HEAD
 SEMAPHORE_ADMIN=admin
 SEMAPHORE_ADMIN_PASSWORD=changeme
 SEMAPHORE_ADMIN_NAME=Admin
 SEMAPHORE_ADMIN_EMAIL=admin@example.com
+=======
+ADMIN_USER=admin
+ADMIN_PASS=changeme
+ADMIN_NAME=Admin
+ADMIN_EMAIL=admin@example.com
+>>>>>>> ab90593 (ADD: Semaphore UI initial commit)