ARCHIVE/rippled
1
0
Fork 0
mirror of https://github.com/XRPLF/rippled.git synced 2025-12-06 17:27:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into bthomee/proto

Browse Source
This commit is contained in:
Bart Thomee
2025-08-06 08:39:23 -04:00
parent 6606676aeb dbeb841b5a
commit 8985e8fce9
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
BUILD.md
View File

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