merge fix

src/main/java/com/ffii/fpsms/modules/deliveryOrder/service/DoWorkbenchMainService.kt

@@ -1523,11 +1523,6 @@ return MessageResponse(
                 dop.deliveryNoteCode = CodeGenerator.generateNo(prefix = prefix, midfix = midfix, latestCode = latestCode)
             }
             deliveryOrderPickOrderRepository.save(dop)
-<<<<<<< HEAD
-
-=======
-            
->>>>>>> e9f1f48edb57d3696af3ffb23bc40d9644c8c44f
         }
         markDeliveryOrdersCompletedForDeliveryOrderPickOrder(deliveryOrderPickOrderId)
         return MessageResponse(