solved some left over merge conflicts

Code/miniRobotRC/JoystickSteuerung.ino

@@ -45,7 +45,7 @@ void joystickInit() {
   void showValuesOnLCD(){
     //TODO BUILD STRING
     //lcd.clear();
-    lcd.gotoXY(0,0);
+    /*lcd.gotoXY(0,0);
     lcd.print("              ");
     lcd.gotoXY(0,0);
     lcd.print("WithLib");
@@ -58,7 +58,9 @@ void joystickInit() {
     lcd.print("              ");
     lcd.gotoXY(0,2);
     lcd.print("RightPWM: ");
-    lcd.print(right -> PWMValue);
+    lcd.print(right -> PWMValue);*/
+    lcdLines[0] = "Links: " + String(left -> PWMValue, DEC);
+    lcdLines[1] = "Links: " + String(right -> PWMValue, DEC);
     }
 
   void send(){

Code/miniRobotRC/_main.ino

@@ -35,21 +35,6 @@ void loop() {
     
   }
   tasten.clearButton(buttonStart);
-  
-<<<<<<< HEAD
-  //Temperatur- und Abstandsmessung
-  /*
-  temperature = dallas(4, 0);
-  
-  if(millis() - timer >= 100){
-	measureDistance();
-	timer = millis();  
-  }
-  
-  distance = calculateDistance();
-  */
-=======
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
 }
 
 void lcdMenu() {

Code/miniRobotRC/fahrsteuerung_old.ino

@@ -6,57 +6,31 @@ void manualDigitalDrive() {
  // while(!tasten.getButtonCycle(buttonL1)) {
     clearCommands();
     if(!tasten.getAnyPressed()) {
-<<<<<<< HEAD
-      //lcd.clear();
-      lcd.println("Warte...");
-=======
       lcdLines[0] = "Warte...";
-      
- 
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
+
     }
     if(tasten.checkButton(buttonB) || tasten.checkButton(buttonUp)) {
             pwmA = -215;
             pwmB = -255;
-<<<<<<< HEAD
-            //lcd.clear();
-            lcd.println("geradeaus fahren");
-=======
             lcdLines[0] = "geradeaus fahren";
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
             goOn =true;
     }
     if(tasten.checkButton(buttonC) || tasten.checkButton(buttonDown)) {
             pwmA = 100;
             pwmB = 255;
-<<<<<<< HEAD
-            //lcd.clear();
-            lcd.println("rueckwaerts fahren");
-=======
             lcdLines[0] = "rueckwaerts fahren";
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
             goOn =true;
      }
     if(tasten.checkButton(buttonRight)) {
         pwmA = -100;  //rechter Motor
         pwmB = 100;
-<<<<<<< HEAD
-        //lcd.clear();
-        lcd.println("rechts lenken");
-=======
         lcdLines[0] = "rechts lenken";
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
             goOn =true;
     } 
     if(tasten.checkButton(buttonLeft)) {
         pwmB = -100;
         pwmA = 100;
-<<<<<<< HEAD
-        //lcd.clear();
-        lcd.println("links lenken");
-=======
         lcdLines[0] = "links lenken";
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
             goOn =true;
     }
       if(goOn) {

Code/miniRobotRC/joystick.ino

@@ -20,23 +20,14 @@ void motorMapping() {
   pwmB = map(leftPWM, -255,255,leftMin,leftMax);
   pwmA = map(rightPWM, -255,255,rightMin,rightMax);
   if((millis() - temp) > 100) {
-<<<<<<< HEAD
-    //lcd.clear();
-    lcd.println("Links: ");
-    lcd.println(pwmB);
-    lcd.gotoXY(0,2);
-    lcd.println("Rechts: ");
-    lcd.println(pwmA);
-=======
  //   lcd.clear();
  //   lcd.println("Links: ");
     lcdLines[0] = "Links: " + String(pwmB, DEC);
  //   lcd.println(pwmB);
  //   lcd.gotoXY(0,2);
  //   lcd.println("Rechts: ");
-    lcdLines[0] = "Rechts: " + String(pwmA, DEC);
+    lcdLines[1] = "Rechts: " + String(pwmA, DEC);
  //  lcd.println(pwmA);
->>>>>>> 48327ec5c42c4d70afa8e9c00bbf52ab2db2ca05
   }
 
   senden();