From 25e8d17108462602c7b14ce30c1df236814811de Mon Sep 17 00:00:00 2001
From: vicky-primathon <67091118+vicky-primathon@users.noreply.github.com>
Date: Tue, 3 Nov 2020 14:46:35 +0530
Subject: [PATCH] Change to resolve conflicts with master branch (#1530)

---
 app/client/src/pages/Editor/QueryEditor/Table.tsx | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/app/client/src/pages/Editor/QueryEditor/Table.tsx b/app/client/src/pages/Editor/QueryEditor/Table.tsx
index 5160116bb6..612f169b60 100644
--- a/app/client/src/pages/Editor/QueryEditor/Table.tsx
+++ b/app/client/src/pages/Editor/QueryEditor/Table.tsx
@@ -27,6 +27,8 @@ export const TableWrapper = styled.div`
   justify-content: space-between;
   flex-direction: column;
   overflow: hidden;
+  min-height: 0px;
+  height: 100%;
   .tableWrap {
     height: 100%;
     display: block;
@@ -38,6 +40,10 @@ export const TableWrapper = styled.div`
     color: ${Colors.THUNDER};
     position: relative;
     background: ${Colors.ATHENS_GRAY_DARKER};
+    display: flex;
+    flex: 1;
+    flex-direction: column;
+    height: 100%;
     display: table;
     width: 100%;
     .thead,
@@ -45,8 +51,8 @@ export const TableWrapper = styled.div`
       overflow: hidden;
     }
     .tbody {
-      overflow-y: scroll;
-      height: auto;
+      height: 100%;
+      overflow: auto;
       .tr {
         width: 100%;
       }