commit

car.cpp

@@ -148,9 +148,14 @@ void Car::followPath()
         break;
     case Road::queueHead:
         Log::i("发送请求车位信号");
+<<<<<<< HEAD
 <<<<<<< HEAD
         emit queueHead(this);
         crash=false;
+=======
+        // emit queueHead(this);
+        emit back(this);
+>>>>>>> parent of ff06e82... Merge branch 'master' of github.com:w-mj/DataStructureProject
 =======
         // emit queueHead(this);
         emit back(this);