From f3ece808b1f420c86795f31a584bb3db7584eb69 Mon Sep 17 00:00:00 2001
From: nvhaizi1 <t412166221@163.com>
Date: Sun, 29 May 2022 13:27:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=90=9E=E9=94=99=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controller.c | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/src/controller.c b/src/controller.c
index 74c13b1..b2dfe13 100644
--- a/src/controller.c
+++ b/src/controller.c
@@ -46,8 +46,16 @@ int FCFSDirection()
 
 bus_query_t *FCFSQuery()
 {
-<<<<<<< HEAD
-    return NULL;
+    bus_query_t *p = queries;
+    if (the_bus->rail_node_pos == p->node)
+    {
+        return p;
+    }
+    else
+    { 
+        queries = queries->next_node;
+        return NULL;
+    }
 }
 
 bus_query_t *SSTFGetQuery()
@@ -78,16 +86,4 @@ int SCANDirection(bus_query_t *target_query)
 bus_query_t *SCANBTWQuery()
 {
     return NULL;
-=======
-    bus_query_t *p = queries;
-    if (the_bus->rail_node_pos == p->node)
-    {
-        return p;
-    }
-    else
-    { 
-        queries = queries->next_node;
-        return NULL;
-    }
->>>>>>> dev
 }
\ No newline at end of file