From 7aba9991f658d78eda59db04f67c3ff5d11bc4c1 Mon Sep 17 00:00:00 2001
From: Madson Jr <junior2590@gmail.com>
Date: Wed, 18 Jul 2018 13:26:27 -0300
Subject: [PATCH] Conflict merge

---
 docker-compose.yml                                   |  2 +-
 .../docker-entrypoint-initdb.d/createdb.sql.example  | 12 ++++++------
 nginx/sites/{default.conf => default.conf.example}   |  0
 workspace/Dockerfile                                 |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)
 rename nginx/sites/{default.conf => default.conf.example} (100%)

diff --git a/docker-compose.yml b/docker-compose.yml
index d9566e85..8b2cbd13 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -685,7 +685,7 @@ services:
       networks:
         - frontend
         - backend
-        
+
 ### Solr ################################################
     solr:
       build:
diff --git a/mysql/docker-entrypoint-initdb.d/createdb.sql.example b/mysql/docker-entrypoint-initdb.d/createdb.sql.example
index 6420afb8..dc48e59b 100644
--- a/mysql/docker-entrypoint-initdb.d/createdb.sql.example
+++ b/mysql/docker-entrypoint-initdb.d/createdb.sql.example
@@ -16,13 +16,13 @@
 #     mysql -u root -p < /docker-entrypoint-initdb.d/createdb.sql
 #
 
-#CREATE DATABASE IF NOT EXISTS `dev_db_1` COLLATE 'utf8_general_ci' ;
-#GRANT ALL ON `dev_db_1`.* TO 'default'@'%' ;
+CREATE DATABASE IF NOT EXISTS `finance_control` COLLATE 'utf8_general_ci' ;
+GRANT ALL ON `finance_control`.* TO 'fincon'@'%' IDENTIFIED BY 'fincon';
 
-#CREATE DATABASE IF NOT EXISTS `dev_db_2` COLLATE 'utf8_general_ci' ;
-#GRANT ALL ON `dev_db_2`.* TO 'default'@'%' ;
+-- CREATE DATABASE IF NOT EXISTS `dev_db_2` COLLATE 'utf8_general_ci' ;
+-- GRANT ALL ON `dev_db_2`.* TO 'default'@'%' ;
 
-#CREATE DATABASE IF NOT EXISTS `dev_db_3` COLLATE 'utf8_general_ci' ;
-#GRANT ALL ON `dev_db_3`.* TO 'default'@'%' ;
+-- CREATE DATABASE IF NOT EXISTS `dev_db_3` COLLATE 'utf8_general_ci' ;
+-- GRANT ALL ON `dev_db_3`.* TO 'default'@'%' ;
 
 FLUSH PRIVILEGES ;
diff --git a/nginx/sites/default.conf b/nginx/sites/default.conf.example
similarity index 100%
rename from nginx/sites/default.conf
rename to nginx/sites/default.conf.example
diff --git a/workspace/Dockerfile b/workspace/Dockerfile
index 6d252364..36e44375 100644
--- a/workspace/Dockerfile
+++ b/workspace/Dockerfile
@@ -787,7 +787,7 @@ RUN if [ ${INSTALL_PG_CLIENT} = true ]; then \
 USER root
 
 RUN apt-get update -yqq \
-    && apt-get -yqq install nasm 
+    && apt-get -yqq install nasm
 
 ###########################################################################
 # Dusk Dependencies: