resolve conflicts and merge

evannetwork · Nov 8, 2023 · 9dc18b1 · 9dc18b1
2 parents 5e9363b + 9f0045f
commit 9dc18b1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 2 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,7 +103,7 @@ optional = true
 # didcomm
 [dependencies.vade-didcomm]
 git = "https://github.com/evannetwork/vade-didcomm.git"
-branch = "feature/fix-pthid-strange-value"
+branch = "develop"
 optional = true
 
 # jwt-vc

diff --git a/VERSIONS.md b/VERSIONS.md
@@ -11,6 +11,7 @@
 
 - fix timestamp generation for `vade-didcomm` in `wasm` build
 - update didcomm dependency for pthid in `get_did_exchange_message`
+- update `vade-didcomm` dependency for `comment` fix in `did-exchange`
 
 ### Deprecation