Resolve conflict

Signed-off-by: srikant <[email protected]>
srikant-ch5 · Jan 7, 2025 · 7429383 · 7429383
2 parents 894eb42 + e4de509
commit 7429383
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/canvas_modules/common-canvas/src/common-properties/controls/controls.scss b/canvas_modules/common-canvas/src/common-properties/controls/controls.scss
@@ -44,6 +44,7 @@
 		display: flex;
 		> div:first-child {
 			width: 100%;
+			overflow-x: auto;
 		}
 	}
 }