From 8667f9253dcd5b4b63a8f06a56185a39ef9a966c Mon Sep 17 00:00:00 2001
From: Faishal Nelwan <108632813+pesolosep@users.noreply.github.com>
Date: Thu, 23 May 2024 20:30:09 +0700
Subject: [PATCH 1/2] finish

---
 .github/workflows/ci.yml                      | 2 +-
 src/main/resources/application-dev.properties | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a833849..f9b4452 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,7 @@ name: Java CI/CD Pipeline
 on:
   push:
     branches:
-      - staging
+      - master
 jobs:
   build:
     name: Build
diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index 4176bef..b47f488 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -1,5 +1,4 @@
 spring.datasource.url=jdbc:postgresql://localhost:5432/postgres
-#spring.datasource.password= ${LOCAL_PASSWORD}
 spring.datasource.username= postgres
 spring.jpa.hibernate.ddl-auto=create
 spring.jpa.show-sql=true
@@ -9,4 +8,4 @@ spring.jpa.properties.hibernate.format_sql=true
 
 
 
-spring.datasource.password= nelwanfamily2004
\ No newline at end of file
+spring.datasource.password= "local pass here"
\ No newline at end of file

From 1c0c767894ebae44c95324b7fa800be2fa463c77 Mon Sep 17 00:00:00 2001
From: Faishal Nelwan <108632813+pesolosep@users.noreply.github.com>
Date: Thu, 23 May 2024 20:34:34 +0700
Subject: [PATCH 2/2] finish subscription box (Muhammad Faishal Adly Nelwan)'s 
 part

---
 src/main/resources/application-dev.properties | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties
index b47f488..14c2d28 100644
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -6,6 +6,4 @@ spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
 spring.jpa.properties.hibernate.format_sql=true
 
 
-
-
 spring.datasource.password= "local pass here"
\ No newline at end of file