Merge conflict resolved prior to develop and master merge

.github/workflows/build-on-pull-request.yml

@@ -31,4 +31,3 @@ jobs:
 
     - name: Perform CodeQL Analysis
       uses: github/codeql-action/analyze@v2
-

.github/workflows/package.yml

@@ -28,11 +28,16 @@ jobs:
 
     - name: Checkout code 
       uses: actions/checkout@v2
+<<<<<<< HEAD
+=======
+
+>>>>>>> origin/master
     - name: Setup JDK 8
       uses: actions/setup-java@v2
       with:
         java-version: 8
         distribution: 'adopt'
+
 
     - name: Build with Maven
       run: mvn clean install -DENV_VAR=${{ env.ENV_VAR }}

src/main/environment/common_local.properties

@@ -0,0 +1,5 @@
+# DataSource settings: set here your own configurations for the database
+spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
+spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
+spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver

src/main/environment/common_test.properties

@@ -2,6 +2,4 @@
 spring.datasource.url=<Enter AMRIT DB_IDENTITY URL here>
 spring.datasource.username=<Enter your AMRIT DB_IDENTITY username>
 spring.datasource.password=<Enter your AMRIT DB_IDENTITY password>
-spring.datasource.driver-class-name=com.mysql.jdbc.Driver
-
-
+spring.datasource.driver-class-name=com.mysql.jdbc.Driver