Skip to content

Commit

Permalink
fix conflict
Browse files Browse the repository at this point in the history
  • Loading branch information
merakulix committed Dec 19, 2024
1 parent 6a787cc commit b5a9f3c
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions ChangeLog.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ Changelog
Changes since last release
-------------
18/12/2024
<<<<<<< HEAD

- Fixes
- #936 A particular defined positioning (of the C++-type CCPACSPositioning) was not available via Python bindings since the std::vector<std::unique_ptr<**Type**>> is not exposed to swig. New getter functions have been implemented in CCPACSPositioning.h to make these elements accesible via index, similar to the implementation of for several other classes. For more information see https://github.com/RISCSoftware/cpacs_tigl_gen/issues/59.
Expand All @@ -14,11 +13,6 @@ Changes since last release
- Update the C++ standard to C++17 (#1045).


=======
- Fixes
- #936 A particular defined positioning (of the C++-type CCPACSPositioning) was not available via Python bindings since the std::vector<std::unique_ptr<**Type**>> is not exposed to swig. New getter functions have been implemented in CCPACSPositioning.h to make these elements accesible via index, similar to the implementation of for several other classes. For more information see https://github.com/RISCSoftware/cpacs_tigl_gen/issues/59.

>>>>>>> 95b5f3c0d71cb763533f8d9eac3f5ebd30b8b1f0
13/11/2024

- Fixes:
Expand Down

0 comments on commit b5a9f3c

Please sign in to comment.