From 4ca99afa80bdd16151a5e68bf5f4818964cbdc1b Mon Sep 17 00:00:00 2001 From: bunnie Date: Thu, 24 Nov 2022 01:16:18 +0800 Subject: [PATCH] fix some merge conflicts that escaped in the loader --- loader/Cargo.toml | 4 ---- loader/curve25519-dalek-loader/Cargo.toml | 4 ---- loader/sha2-loader/Cargo.toml | 4 ---- 3 files changed, 12 deletions(-) diff --git a/loader/Cargo.toml b/loader/Cargo.toml index 11176d06b..3cb22fa6d 100644 --- a/loader/Cargo.toml +++ b/loader/Cargo.toml @@ -8,11 +8,7 @@ description = "Initial kernel loader for Xous" [dependencies] ed25519-dalek-loader = { path = "ed25519-dalek-loader", default-features = false } 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.9", optional = true, default-features = false } ->>>>>>> feat/user-preferences [dependencies.com_rs] git = "https://github.com/betrusted-io/com_rs" diff --git a/loader/curve25519-dalek-loader/Cargo.toml b/loader/curve25519-dalek-loader/Cargo.toml index fc43f24a2..96dcfcf19 100644 --- a/loader/curve25519-dalek-loader/Cargo.toml +++ b/loader/curve25519-dalek-loader/Cargo.toml @@ -55,11 +55,7 @@ packed_simd = { version = "0.3.4", package = "packed_simd_2", features = [ ], optional = true } zeroize = { version = "1", default-features = false } fiat-crypto = { version = "0.1.6", optional = true } -<<<<<<< HEAD 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 log = { version = "0.4", optional = true } diff --git a/loader/sha2-loader/Cargo.toml b/loader/sha2-loader/Cargo.toml index 6744baad0..32bb0ef02 100644 --- a/loader/sha2-loader/Cargo.toml +++ b/loader/sha2-loader/Cargo.toml @@ -12,11 +12,7 @@ description = "sha2 hardware accelerator engine" digest = "0.9.0" block-buffer = "0.9.0" 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.9", optional = true, default-features = false } ->>>>>>> feat/user-preferences [features] precursor = ["utralib/precursor"]