Merge branch 'master' of https://git.swarmlab.io:3000/cs151051/smartParking

5 years ago · e58c6ef0a3
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
  
 }