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

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

 void loop() {
  // Calculating the distance
-<<<<<<< HEAD
  //distance= getDistance();
-=======
-  distance= getDistance();
+  //distance= getDistance();
  park(Serial_Input());
->>>>>>> b0babf3fb5efd5a1eaec732fcec23eef4b0d8956
  
 }
Author	SHA1	Message	Date
cs161079	5d0a08eea4	Merge branch 'master' of https://git.swarmlab.io:3000/cs151051/smartParking	5 years ago
cs161079	9ef1e83fd2	Update v1.1	5 years ago