From bb707928e144992bdffda45698a93d8332098180 Mon Sep 17 00:00:00 2001
From: w-mj <w.mingjian@yahoo.com>
Date: Mon, 25 Dec 2017 20:50:47 +0800
Subject: [PATCH] Revert "Merge branch 'master' of
 github.com:w-mj/DataStructureProject"

This reverts commit ff06e82fa70fb576010ec370c642a074635549f0, reversing
changes made to af2a3938eca41eef4226b7f61d8c54a0ea517ab6.
---
 car.cpp | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/car.cpp b/car.cpp
index a837ad0..f4c1655 100644
--- a/car.cpp
+++ b/car.cpp
@@ -148,18 +148,9 @@ 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);
->>>>>>> parent of ff06e82... Merge branch 'master' of github.com:w-mj/DataStructureProject
+        // emit back(this);
         break;
     case Road::none:
         break;