From bb0a2c974863a964a76860dc5fcd4b20d0ba49cc Mon Sep 17 00:00:00 2001
From: handreas <andreas.hamacher@monash.edu>
Date: Fri, 28 Feb 2020 10:04:58 +0000
Subject: [PATCH] missed one
---
roles/mysql/tasks/mysql_server.yml | 3 ---
1 file changed, 3 deletions(-)
diff --git a/roles/mysql/tasks/mysql_server.yml b/roles/mysql/tasks/mysql_server.yml
index 48185732..4dd030c3 100644
--- a/roles/mysql/tasks/mysql_server.yml
+++ b/roles/mysql/tasks/mysql_server.yml
@@ -16,14 +16,11 @@
become: true
register: mysqldb_confdir_create
-<<<<<<< HEAD
- name: make sure mysql conf directory exists
file: dest=/etc/mysql/conf.d state=directory
become: true
register: mysqldb_confdir_create
-=======
->>>>>>> origin/master
- name: "Starting MySQL"
service: name={{ sqlServiceName }} state=started enabled=true
become: true
--
GitLab