From ce05e566ca7e844593d17bca27cc2754ce6962e2 Mon Sep 17 00:00:00 2001
From: manish kumar <manish@appsmith.com>
Date: Tue, 30 May 2023 10:18:50 +0530
Subject: [PATCH] merge resolution with master

---
 .../Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts  | 2 --
 .../e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js | 1 -
 deploy/docker/entrypoint.sh                                     | 2 --
 3 files changed, 5 deletions(-)
 mode change 100755 => 100644 deploy/docker/entrypoint.sh

diff --git a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts
index 2d63d6bcb7..a734c0ea63 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts
+++ b/app/client/cypress/e2e/Regression/ClientSide/Autocomplete/Autocomplete_JS_spec.ts
@@ -68,7 +68,6 @@ describe("Autocomplete tests", () => {
   it("2. Check for bindings not available in other page", () => {
     // dependent on above case: 1st page should have DocumentViewer widget
     _.entityExplorer.AddNewPage();
-
     // create js object
     _.jsEditor.CreateJSObject(jsObjectBody, {
       paste: true,
@@ -300,7 +299,6 @@ describe("Autocomplete tests", () => {
 
   it("8. Multiple binding in single line", () => {
     _.dataSources.CreateDataSource("Postgres", true, false);
-
     _.dataSources.CreateQueryAfterDSSaved(
       "SELECT * FROM worldCountryInfo where {{appsmith.store}} {{appsmith}}",
     );
diff --git a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
index 5fc76db39c..643d4294ce 100644
--- a/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
+++ b/app/client/cypress/e2e/Regression/ClientSide/Widgets/Modal/Modal_focus_spec.js
@@ -71,7 +71,6 @@ describe("Modal focus", function () {
   });
   it("2. Should not focus on the input field if autofocus is disabled", () => {
     cy.openPropertyPaneFromModal("inputwidgetv2");
-
     // autofocus for input field is disabled
     cy.get(".t--property-control-autofocus")
       .find(".ads-v2-switch")
diff --git a/deploy/docker/entrypoint.sh b/deploy/docker/entrypoint.sh
old mode 100755
new mode 100644
index 1c636e10e5..89e66940dd
--- a/deploy/docker/entrypoint.sh
+++ b/deploy/docker/entrypoint.sh
@@ -336,7 +336,6 @@ init_postgres() {
         echo "Found existing Postgres, Skipping initialization"
     else
       echo "Initializing local postgresql database"
-
       mkdir -p $POSTGRES_DB_PATH
 
       # Postgres does not allow it's server to be run with super user access, we use user postgres and the file system owner also needs to be the same user postgres
@@ -350,7 +349,6 @@ init_postgres() {
 
       # Create mockdb db and user and populate it with the data
       seed_embedded_postgres
-
       # Stop the postgres daemon
       su postgres -c "/usr/lib/postgresql/13/bin/pg_ctl stop -D $POSTGRES_DB_PATH"
     fi