From 72eda9e0705fb6497724ceb6fc19e9e56c80de38 Mon Sep 17 00:00:00 2001 From: Matt Menefee Date: Tue, 12 May 2026 19:19:06 -0600 Subject: [PATCH] Resolve conflict markers in blackvariancecurve.cpp copyright header Commit 4f35d3eab ("QPR-14001 merge ql 1.42.1 (Work in progress)") left unresolved Git conflict markers in the copyright header of ql/termstructures/volatility/equityfx/blackvariancecurve.cpp. The follow-up commit d500a5fdc ("QPR-14001 bugfixes after QL upgrade to 1.42.1") did not clean them up. The markers fall inside the /* */ copyright block so the file compiles, but they remain on master tip and trip code-review tooling that greps for unresolved merge markers. Resolution: keep both copyright lines (AcadiaSoft and Paolo D'Elia) and drop the marker lines. No code change. --- ql/termstructures/volatility/equityfx/blackvariancecurve.cpp | 3 --- 1 file changed, 3 deletions(-) diff --git a/ql/termstructures/volatility/equityfx/blackvariancecurve.cpp b/ql/termstructures/volatility/equityfx/blackvariancecurve.cpp index 3e5406858f..72cd9310b3 100644 --- a/ql/termstructures/volatility/equityfx/blackvariancecurve.cpp +++ b/ql/termstructures/volatility/equityfx/blackvariancecurve.cpp @@ -3,11 +3,8 @@ /* Copyright (C) 2002, 2003, 2004 Ferdinando Ametrano Copyright (C) 2003 StatPro Italia srl -<<<<<<< HEAD Copyright (C) 2025 AcadiaSoft, Inc. -======= Copyright (C) 2026 Paolo D'Elia ->>>>>>> QL_1_42_1 This file is part of QuantLib, a free-software/open-source library for financial quantitative analysts and developers - http://quantlib.org/