mirror of
https://github.com/saymrwulf/xous-core.git
synced 2026-11-18 08:52:45 +00:00
fix some merge conflicts that escaped in the loader
This commit is contained in:
parent
ae68aa4120
commit
4ca99afa80
3 changed files with 0 additions and 12 deletions
|
|
@ -8,11 +8,7 @@ description = "Initial kernel loader for Xous"
|
||||||
[dependencies]
|
[dependencies]
|
||||||
ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false }
|
ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false }
|
||||||
curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = ["u32e_backend"] }
|
curve25519-dalek-loader = { path = "curve25519-dalek-loader", default-features = false, features = ["u32e_backend"] }
|
||||||
<<<<<<< HEAD
|
|
||||||
utralib = { version = "0.1.11", optional = true, default-features = false }
|
utralib = { version = "0.1.11", optional = true, default-features = false }
|
||||||
=======
|
|
||||||
utralib = { version = "0.1.9", optional = true, default-features = false }
|
|
||||||
>>>>>>> feat/user-preferences
|
|
||||||
|
|
||||||
[dependencies.com_rs]
|
[dependencies.com_rs]
|
||||||
git = "https://github.com/betrusted-io/com_rs"
|
git = "https://github.com/betrusted-io/com_rs"
|
||||||
|
|
|
||||||
|
|
@ -55,11 +55,7 @@ packed_simd = { version = "0.3.4", package = "packed_simd_2", features = [
|
||||||
], optional = true }
|
], optional = true }
|
||||||
zeroize = { version = "1", default-features = false }
|
zeroize = { version = "1", default-features = false }
|
||||||
fiat-crypto = { version = "0.1.6", optional = true }
|
fiat-crypto = { version = "0.1.6", optional = true }
|
||||||
<<<<<<< HEAD
|
|
||||||
utralib = { version = "0.1.11", optional = true, default-features = false }
|
utralib = { version = "0.1.11", optional = true, default-features = false }
|
||||||
=======
|
|
||||||
utralib = { version = "0.1.9", optional = true, default-features = false }
|
|
||||||
>>>>>>> feat/user-preferences
|
|
||||||
|
|
||||||
# Betrusted/Precursor dependency set
|
# Betrusted/Precursor dependency set
|
||||||
log = { version = "0.4", optional = true }
|
log = { version = "0.4", optional = true }
|
||||||
|
|
|
||||||
|
|
@ -12,11 +12,7 @@ description = "sha2 hardware accelerator engine"
|
||||||
digest = "0.9.0"
|
digest = "0.9.0"
|
||||||
block-buffer = "0.9.0"
|
block-buffer = "0.9.0"
|
||||||
opaque-debug = "0.3.0" # prevents internal hash state leakage from debug structures
|
opaque-debug = "0.3.0" # prevents internal hash state leakage from debug structures
|
||||||
<<<<<<< HEAD
|
|
||||||
utralib = { version = "0.1.11", optional = true, default-features = false }
|
utralib = { version = "0.1.11", optional = true, default-features = false }
|
||||||
=======
|
|
||||||
utralib = { version = "0.1.9", optional = true, default-features = false }
|
|
||||||
>>>>>>> feat/user-preferences
|
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
precursor = ["utralib/precursor"]
|
precursor = ["utralib/precursor"]
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue