Update v1.1

1 changed files with 4 additions and 0 deletions
--- a/autonomousCar/autonomousCar.ino
+++ b/autonomousCar/autonomousCar.ino
@ -282,7 +282,11 @@ int Serial_Input()

 void loop() {
  // Calculating the distance
+<<<<<<< HEAD
+  //distance= getDistance();
+=======
  distance= getDistance();
  park(Serial_Input());
+>>>>>>> b0babf3fb5efd5a1eaec732fcec23eef4b0d8956
  
 }
Author	SHA1	Message	Date
cs161079	c03a6ef788	Update v1.1	5 years ago
cs161079	b4409836c6	Update v1.1	5 years ago