Skip to content

Resolve conflict markers in blackvariancecurve.cpp copyright header #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mattmenefee wants to merge 1 commit into
base: master
Choose a base branch
from
+0 −3
Open

Resolve conflict markers in blackvariancecurve.cpp copyright header #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions ql/termstructures/volatility/equityfx/blackvariancecurve.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down