summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacob Rosenthal <jacobrosenthal@gmail.com>2020-09-12 13:38:04 -0700
committerJacob Rosenthal <jacobrosenthal@gmail.com>2020-09-12 13:38:04 -0700
commiteb82c0723861b4ae78b0ae318f7f4e5e63b95a17 (patch)
tree433b182d97e79c016a91b640d1e00f87da3bd8cb
parent52329d22febd6f19a63ab398de1dbc2a228ee3d9 (diff)
downloadnrf-softdevice-eb82c0723861b4ae78b0ae318f7f4e5e63b95a17.zip
vscode
-rw-r--r--.cargo/config (renamed from example/.cargo/config)0
-rw-r--r--Cargo.toml2
-rw-r--r--rust-toolchain1
3 files changed, 1 insertions, 2 deletions
diff --git a/example/.cargo/config b/.cargo/config
index 3f319ae..3f319ae 100644
--- a/example/.cargo/config
+++ b/.cargo/config
diff --git a/Cargo.toml b/Cargo.toml
index 4afd34b..13571b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,5 @@
-cargo-features = ["resolver"]
[workspace]
-resolver = "2"
members = [
"nrf-softdevice",
"nrf-softdevice-mbr",
diff --git a/rust-toolchain b/rust-toolchain
new file mode 100644
index 0000000..07ade69
--- /dev/null
+++ b/rust-toolchain
@@ -0,0 +1 @@
+nightly \ No newline at end of file