From dd1c643be561ebfbb521431b49d6e1e65bfcbd81 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:49:07 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
index 7b3b455..c9db21e 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
@@ -128,7 +128,7 @@
鑾峰彇鏄庣粏
</button>
<!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
- ></lightning-button> -->
+ ></lightning-button> -->
</td>
</tr>
</tbody>
@@ -224,4 +224,4 @@
</div>
</div>
</div>
-</template>
\ No newline at end of file
+</template>
--
Gitblit v1.9.1