Merge branch develop

thejohnfreeman · Jul 19, 2023 · d927f9e · d927f9e
2 parents 3015aef + 01df19c
commit d927f9e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/BUILD.md b/BUILD.md
@@ -256,12 +256,14 @@ and can be helpful for detecting `#include` omissions.
 
 ### Conan
 
-If you have trouble building dependencies after changing Conan settings,
-try removing the Conan cache.
+After any updates or changes to dependencies, you may need to do the following:
 
-```
-rm -rf ~/.conan/data
-```
+1. Remove your build directory.
+2. Remove the Conan cache:
+   ```
+   rm -rf ~/.conan/data
+   ```
+4. Re-run [conan install](#build-and-test).
 
 
 ### no std::result_of

diff --git a/src/ripple/protocol/impl/BuildInfo.cpp b/src/ripple/protocol/impl/BuildInfo.cpp
@@ -33,7 +33,7 @@ namespace BuildInfo {
 //  and follow the format described at http://semver.org/
 //------------------------------------------------------------------------------
 // clang-format off
-char const* const versionString = "1.12.0-b1"
+char const* const versionString = "1.12.0-b2"
 // clang-format on
 
 #if defined(DEBUG) || defined(SANITIZER)