joylink/rts-sim-module
6
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

【修改冲突】

Browse Source
This commit is contained in:
weizhihong 2023-10-13 14:07:17 +08:00
parent fc3defbae3
commit f6ff5bdf69
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
proto/src/model.proto
View File

@ -18,13 +18,10 @@ message Repository {
repeated Relay relays = 11;
repeated PhaseFailureProtector phaseFailureProtectors = 12;
repeated Button buttons = 13;
<<<<<<< HEAD
repeated Light lights = 14;
repeated Alarm alarms = 15;
repeated Station stations = 16;
=======
repeated Psd psds = 14;
>>>>>>> 24c455cc6f8bc85738372cd78915117c1e4cade0
repeated Light lights = 15;
repeated Alarm alarms = 16;
repeated Station stations = 17;
}
//物理区段