fixed errors

mtgag · Jun 20, 2024 · 6b4c5ed · 6b4c5ed
1 parent 4e94b6d
commit 6b4c5ed
Showing 1 changed file with 3 additions and 5 deletions.
diff --git a/v3/util/time.go b/v3/util/time.go
@@ -78,14 +78,12 @@ var (
 	CABFBRs_2_0_0_Date                               = time.Date(2023, time.September, 15, 0, 0, 0, 0, time.UTC)
 	NoReservedDomainLabelsDate                       = time.Date(2021, time.October, 1, 0, 0, 0, 0, time.UTC)
 	CABFBRs_OU_Prohibited_Date                       = time.Date(2022, time.September, 1, 0, 0, 0, 0, time.UTC)
-<<<<<<< HEAD
 	EtsiPSD2Date                                     = time.Date(2018, time.November, 1, 0, 0, 0, 0, time.UTC)
 	CABAltRegNumEvExtMandDate                        = time.Date(2020, time.January, 31, 0, 0, 0, 0, time.UTC)
 	CABAltRegNumEvDate                               = time.Date(2019, time.June, 21, 0, 0, 0, 0, time.UTC)
-=======
-	SC17EffectiveDate                                = time.Date(2019, time.June, 21, 0, 0, 0, 0, time.UTC)
->>>>>>> 04d863f7660edfe0498162334524742397226fb2
-	CABF_SMIME_BRs_1_0_0_Date                        = time.Date(2023, time.September, 1, 0, 0, 0, 0, time.UTC)
+
+	SC17EffectiveDate         = time.Date(2019, time.June, 21, 0, 0, 0, 0, time.UTC)
+	CABF_SMIME_BRs_1_0_0_Date = time.Date(2023, time.September, 1, 0, 0, 0, 0, time.UTC)
 	// Enforcement date of CRL reason codes from Ballot SC 061
 	CABFBRs_1_8_7_Date = time.Date(2023, time.July, 15, 0, 0, 0, 0, time.UTC)
 	// Updates to the CABF BRs and EVGLs from Ballot SC 062 https://cabforum.org/2023/03/17/ballot-sc62v2-certificate-profiles-update/