Skip to content
Snippets Groups Projects
Commit 8ae3bcb2 authored by Juliano Murari's avatar Juliano Murari
Browse files

Merge remote-tracking branch 'upstream/master' 

Conflicts:
	10-Top/bcmioc/top.bob
parents 36de940a f161f355
No related branches found
No related tags found
1 merge request!31BCM updates
Hide whitespace changes
Inline Side-by-side
Showing
with 3 additions and 3 deletions
10-Top/bcmioc/top.bob
+ 3
− 3
View file @ 8ae3bcb2
...@@ -92,15 +92,15 @@ ...@@ -92,15 +92,15 @@
<P>PBI-BCM01:</P> <P>PBI-BCM01:</P>
<R>Ctrl-AMC-110:</R> <R>Ctrl-AMC-110:</R>
<SYSTEM1>ISrc-010:PBI-BCM-001:</SYSTEM1> <SYSTEM1>ISrc-010:PBI-BCM-001:</SYSTEM1>
<SYSTEM10>DTL-040:PBI-BCM-001:</SYSTEM10> <SYSTEM10>$(P)$(R)AI10-</SYSTEM10>
<SYSTEM2>LEBT-010:PBI-BCM-001:</SYSTEM2> <SYSTEM2>LEBT-010:PBI-BCM-001:</SYSTEM2>
<SYSTEM3>RFQ-010:PBI-BCM-001:</SYSTEM3> <SYSTEM3>RFQ-010:PBI-BCM-001:</SYSTEM3>
<SYSTEM4>MEBT-010:PBI-BCM-001:</SYSTEM4> <SYSTEM4>MEBT-010:PBI-BCM-001:</SYSTEM4>
<SYSTEM5>MEBT-010:PBI-BCM-002:</SYSTEM5> <SYSTEM5>MEBT-010:PBI-BCM-002:</SYSTEM5>
<SYSTEM6>DTL-010:PBI-BCM-001:</SYSTEM6> <SYSTEM6>DTL-010:PBI-BCM-001:</SYSTEM6>
<SYSTEM7>DTL-020:PBI-BCM-001:</SYSTEM7> <SYSTEM7>DTL-020:PBI-BCM-001:</SYSTEM7>
<SYSTEM8>ISrc-010:ISS-HVPf:</SYSTEM8> <SYSTEM8>ISrc-010:ISS-HVPf-001:</SYSTEM8>
<SYSTEM9>DTL-030:PBI-BCM-001:</SYSTEM9> <SYSTEM9>$(P)$(R)AI9-</SYSTEM9>
</macros> </macros>
<file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file> <file>../../99-Shared/adsis8300bcm/bcm_inst.bob</file>
<x>10</x> <x>10</x>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment