missed one

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