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/parentComponentTest/parentComponentTest.js |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/lwc/parentComponentTest/parentComponentTest.js b/force-app/main/default/lwc/parentComponentTest/parentComponentTest.js
index 3fd8c41..30c8595 100644
--- a/force-app/main/default/lwc/parentComponentTest/parentComponentTest.js
+++ b/force-app/main/default/lwc/parentComponentTest/parentComponentTest.js
@@ -59,4 +59,4 @@
         this.newPageId = this.currentPageReference.state.c__ids;
     }
     ////Navigation End
-}
+}
\ No newline at end of file

--
Gitblit v1.9.1