dependency update

Merge pull request 'dependency update' (#70 ) from dependency-update into main
Reviewed-on: #70
2025-07-22 11:13:52 +02:00 · 2025-07-22 10:23:57 +02:00 · 2025-07-22 00:24:54 +02:00
1 changed files with 4 additions and 0 deletions
--- a/va416xx-embassy/Cargo.toml
+++ b/va416xx-embassy/Cargo.toml
@@ -11,7 +11,11 @@ keywords = ["no-std", "hal", "cortex-m", "vorago", "va416xx"]
 categories = ["aerospace", "embedded", "no-std", "hardware-support"]

 [dependencies]
+<<<<<<< HEAD
+vorago-shared-periphs = { path = "../../vorago-shared-periphs", features = ["vor4x"] }
+=======
 vorago-shared-periphs = { git = "https://egit.irs.uni-stuttgart.de/rust/vorago-shared-periphs.git", rev = "c8e475cbba820a4b235b46f3d284e23d72396855", features = ["vor4x"] }
+>>>>>>> c30315d (dependency update)
 va416xx-hal = { path = "../va416xx-hal" }

 [features]
Author	SHA1	Message	Date
Robin Mueller	dc434efb4a	dependency update	2025-07-22 11:13:52 +02:00
Robin Müller	c1e4935d22	Merge pull request 'dependency update' (#70 ) from dependency-update into main Reviewed-on: #70	2025-07-22 10:23:57 +02:00
Robin Mueller	e692f922a4	dependency update	2025-07-22 00:24:54 +02:00