From 36d15f189de2e83ce2576715dac30c3c260388dd Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 14:47:50 +0800
Subject: [PATCH] fixconflict
---
force-app/main/default/lwc/parentComponentTest/parentComponentTest.html | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/force-app/main/default/lwc/parentComponentTest/parentComponentTest.html b/force-app/main/default/lwc/parentComponentTest/parentComponentTest.html
index 7ed80b6..572df46 100644
--- a/force-app/main/default/lwc/parentComponentTest/parentComponentTest.html
+++ b/force-app/main/default/lwc/parentComponentTest/parentComponentTest.html
@@ -41,4 +41,4 @@
</lightning-vertical-navigation>
<p>Current Page is <strong>{newPageId}</strong></p>
</lightning-card>
-</template>
+</template>
\ No newline at end of file
--
Gitblit v1.9.1