Merge branch 'develop' into bthomee/proto

This commit is contained in:
Bart Thomee
2025-08-06 08:39:23 -04:00

View File

@@ -527,7 +527,11 @@ After any updates or changes to dependencies, you may need to do the following:
conan remove '*'
```
<<<<<<< HEAD
3. Re-run [conan export](#patched-recipes) if needed.
=======
3. Re-run [conan export](#export-updated-recipes)
>>>>>>> develop
4. Re-run [conan install](#build-and-test).
### `protobuf/port_def.inc` file not found