From 48c99b404055be9f1231fdb9f436858ab467baf9 Mon Sep 17 00:00:00 2001
From: Philipp <psenfft@stud.hs-heilbronn.de>
Date: Wed, 16 Apr 2025 16:37:18 +0200
Subject: [PATCH] merge

---
 Cargo.toml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index af7abba..9d2f374 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -7,11 +7,8 @@ edition = "2024"
 chrono = { version = "0.4.40", features = ["serde"] }
 gpio = "0.4.1"
 regex = "1.11.1"
-<<<<<<< HEAD
 rppal = "0.22.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
-=======
 rocket = "0.5.1"
 tokio = { version = "1.44.2", features = ["full"] }
->>>>>>> eb39b09632efb1568079352e3d639edc79df65fd