Fix merge conflict in Product.scss

src/Styles/Product/Product.scss

@@ -21,6 +21,7 @@
 .productinputForm {
   display: flex;
   flex-wrap: wrap;
+  gap: 6px;
 
   & .field-DropDown {
     width: 200px !important;
@@ -117,6 +118,24 @@
     left: 2px;
   }
 }
+.ProSubRowFlex {
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+  gap: 1.5rem;
+  width: 100%;
+
+  .ant-form-item,
+  .float-label {
+    margin-bottom: 0;
+  }
+
+  .ant-form-item-explain-error {
+    position: relative;
+    top: 16px;
+    left: 2px;
+  }
+}
 
 .scannerdiv {
   display: flex;
@@ -462,10 +481,12 @@
   flex-wrap: wrap;
   justify-content: flex-start;
   padding-bottom: 0;
+  flex-direction: row !important;
 
   @media (max-width: 768px) {
     gap: 10px;
     align-items: flex-start;
+    justify-content: space-between;
   }
 }
 
@@ -482,7 +503,8 @@
 }
 
 .productFormproductImg {
-  width: 350px;
+  width: 250px;
+  height: 190px;
   align-items: center;
 }
 
@@ -604,4 +626,13 @@
   height: 12px;
   background-color: #fff;
   padding: 2px;
-}
+}
+.ProductMainRowFlex {
+  display: flex;
+  align-items: flex-start;
+  gap: 1rem;
+  width: 100%;
+  @media (max-width: 768px) {
+    flex-direction: column;
+  }
+}