From 2e001eddeeeaea3aa9c607df72d2196572a717da Mon Sep 17 00:00:00 2001
From: Yuan <yuanliyedefy@gmail.com>
Date: Thu, 8 Jun 2023 09:44:41 +0800
Subject: [PATCH] merge

---
 protos/stationLayoutGraphics.proto | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/protos/stationLayoutGraphics.proto b/protos/stationLayoutGraphics.proto
index 6cafdea..53ab7b5 100644
--- a/protos/stationLayoutGraphics.proto
+++ b/protos/stationLayoutGraphics.proto
@@ -10,11 +10,8 @@ message RtssGraphicStorage {
   repeated Station stations = 5;
   repeated Rect Rects = 6;
   repeated Train train = 7;
-<<<<<<< HEAD
-  repeated Turnout turnouts = 8;
-=======
   repeated Signal signals = 8;
->>>>>>> 86de0cff9ee560f0c7e670184d5baccfdb28ee44
+  repeated Turnout turnouts = 9;
 }
 
 message Canvas {