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/objects/ODS__c/validationRules/Email_Isblank.validationRule-meta.xml |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/force-app/main/default/objects/ODS__c/validationRules/Email_Isblank.validationRule-meta.xml b/force-app/main/default/objects/ODS__c/validationRules/Email_Isblank.validationRule-meta.xml
index eea8dd0..d7c8705 100644
--- a/force-app/main/default/objects/ODS__c/validationRules/Email_Isblank.validationRule-meta.xml
+++ b/force-app/main/default/objects/ODS__c/validationRules/Email_Isblank.validationRule-meta.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ValidationRule xmlns="http://soap.sforce.com/2006/04/metadata">
     <fullName>Email_Isblank</fullName>
-    <active>true</active>
+    <active>false</active>
     <description>email涓嶈兘涓虹┖锛�</description>
     <errorConditionFormula>ISBLANK( Email__c )</errorConditionFormula>
     <errorDisplayField>Email__c</errorDisplayField>

--
Gitblit v1.9.1