resolve merge conflict

This commit is contained in:
Robin Müller 2022-05-12 20:48:50 +02:00
parent 02473a0cd7
commit fc2b709148
No known key found for this signature in database
GPG Key ID: 11D4952C8CCEF814
1 changed files with 0 additions and 4 deletions

View File

@ -85,7 +85,6 @@
## Additions
<<<<<<< HEAD
- LTO support: Allow using LTO/IPO by setting `FSFW_ENABLE_LTO=1`. CMake is able to detect whether
the user compiler supports IPO/LPO. LTO is on by default now. Most modern compilers support it,
can make good use of it and it usually makes the code faster and/or smaller.
@ -100,9 +99,6 @@
Easiest solution for now: Keep this option OFF by default.
- Linux HAL: Add wiretapping option for I2C. Enabled with `FSFW_HAL_I2C_WIRETAPPING` defined to 1
>>>>>>> origin/develop
- Dedicated Version class and constant `fsfw::FSFW_VERSION` containing version information
inside `fsfw/version.h`