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/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml
index 5196c19..171ac69 100644
--- a/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml
+++ b/force-app/main/default/aura/TestForceInputByLiJun/TestForceInputByLiJun.cmp-meta.xml
@@ -2,4 +2,4 @@
 <AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
     <apiVersion>42.0</apiVersion>
     <description>A Lightning Component Bundle</description>
-</AuraDefinitionBundle>
\ No newline at end of file
+</AuraDefinitionBundle>

--
Gitblit v1.9.1