From 5a69a3dc4751eec69489536b0a35a488db48313a Mon Sep 17 00:00:00 2001
From: DenialOfIntelligence <renkenjakob@gmail.com>
Date: Tue, 27 Jun 2023 18:07:14 +0200
Subject: [PATCH] Removed merge conflict markers

---
 Receiver/Receiver.ino       | 3 +--
 Transceiver/Transceiver.ino | 4 +---
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Receiver/Receiver.ino b/Receiver/Receiver.ino
index 93106e9..b014b8b 100644
--- a/Receiver/Receiver.ino
+++ b/Receiver/Receiver.ino
@@ -41,7 +41,7 @@ void loop() {
     Serial.print("X Pos");
     Serial.println(myData.Xposition);
     if (myData.Yposition >= 700) {
->>>>>>> Structs
+
       digitalWrite(3, 1);
       digitalWrite(2, 0);
       digitalWrite(4, 0);
@@ -63,7 +63,6 @@ void loop() {
       digitalWrite(A4, 1);
     }
     if (myData.Xposition >= 700){
->>>>>>> Structs
       digitalWrite(3, 1);
       digitalWrite(2, 0);
       digitalWrite(4, 1);
diff --git a/Transceiver/Transceiver.ino b/Transceiver/Transceiver.ino
index 893e2e1..b575b91 100644
--- a/Transceiver/Transceiver.ino
+++ b/Transceiver/Transceiver.ino
@@ -8,7 +8,7 @@ struct dataStruct {
     int Yposition;
 
 } myData;
->>>>>>> Structs
+
 void setup() {
   radio.begin();
   radio.setPALevel(RF24_PA_MAX);
@@ -17,7 +17,6 @@ void setup() {
   radio.stopListening();
   Serial.begin(9600);
 
->>>>>>> Structs
 }
 
 void loop() {
@@ -27,5 +26,4 @@ void loop() {
   myData.Yposition = analogRead(1);
   radio.write(&myData, sizeof(myData), 1);
   delay(10);
->>>>>>> Structs
 }