From 08991a8e69e72843b881bcc62cb593a70e04d83c Mon Sep 17 00:00:00 2001
From: Xavier Robin <xavier.robin@unibas.ch>
Date: Fri, 21 Jul 2023 16:11:41 +0200
Subject: [PATCH] fix: resolve merge conflict
---
modules/io/pymod/export_omf_io.cc | 1 -
1 file changed, 1 deletion(-)
diff --git a/modules/io/pymod/export_omf_io.cc b/modules/io/pymod/export_omf_io.cc
index d2df0e475..43355a4a9 100644
--- a/modules/io/pymod/export_omf_io.cc
+++ b/modules/io/pymod/export_omf_io.cc
@@ -61,7 +61,6 @@ void export_omf_io() {
.value("ROUND_BFACTORS", OMF::ROUND_BFACTORS)
.value("SKIP_SS", OMF::SKIP_SS)
.value("INFER_PEP_BONDS", OMF::INFER_PEP_BONDS)
- .value("INFER_AA_POS", OMF::INFER_AA_POS)
;
class_<OMF, OMFPtr>("OMF",no_init)
--
GitLab