merge
This commit is contained in:
parent
e7a80d731e
commit
2e001eddee
@ -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 {
|
||||
|
Loading…
Reference in New Issue
Block a user