From ec4a40e72fcf644a0b8256230799cdaeeffe89cf Mon Sep 17 00:00:00 2001
From: Shaz hemani <shahzad@octek.co>
Date: Fri, 11 Sep 2020 19:11:00 +0500
Subject: [PATCH] issue conflict resolved

---
 Makefile              | 2 +-
 scripts/db/dml_01.sql | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 9d5de03..7651a95 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 export NAME=genitywebapp
 
 build:
-	docker-compose build
+	COMPOSE_PROJECT_NAME=genitywebapp  docker-compose up --build
 
 run: build
 	docker-compose up
diff --git a/scripts/db/dml_01.sql b/scripts/db/dml_01.sql
index 0ee150a..0d46f89 100644
--- a/scripts/db/dml_01.sql
+++ b/scripts/db/dml_01.sql
@@ -1 +1 @@
-INSERT INTO users (title,created_on) VALUES('shahzad','2013-06-01');
\ No newline at end of file
+INSERT INTO users (title,created_on, uuid) VALUES('shahzad','2013-06-01', '8272-28292-287292');
\ No newline at end of file