mirror of
https://github.com/XRPLF/rippled.git
synced 2025-11-28 06:55:50 +00:00
Merge branch 'develop' into bthomee/proto
This commit is contained in:
4
BUILD.md
4
BUILD.md
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user