fix conflict

roles/easy-rsa-common/defaults/readme.txt

roles/karaage3.1.17/tasks/apacheDebian.yml

roles/karaage3.1.17/tasks/karaage.yml

roles/karaage3.1.17/templates/settings.py.j2

roles/karaage3.1.17/templates/ssl.conf.j2

roles/karaage3.1.17/vars/main.yml

roles/ldapserver/tasks/main.yml

roles/mysql/templates/mysql.cnf.j2

roles/shibboleth-sp/handlers/main.yml

roles/shibboleth-sp/tasks/shibbolethConfig.yml

roles/shibboleth-sp/tasks/shibbolethPrerequisites.yml

templates/easy-rsa/vars.j2