Fixed typo
Conflicts:
This commit is contained in:
@ -42,7 +42,11 @@ epicsEnvSet("INSTR","SQ:SINQTEST:")
|
||||
|
||||
iocInit()
|
||||
```
|
||||
<<<<<<< HEAD
|
||||
The first line is a so-called shebang which instructs Linux to execute the file with the executable located at the given path - the IOC shell in this case. The controller script "mcu1.cmd" looks like this:
|
||||
=======
|
||||
The first line is a so-called shebang which instructs Linux to execute the file with the executable located at the given path - the IOC shell in this case. The controller script "mcu1.cmd" then look like this:
|
||||
>>>>>>> be9f3b0d76776213d00b2ca27191eb436e896cbe
|
||||
```
|
||||
# Define some needed parameters (they can be safely overwritten in e.g. mcu2.cmd)
|
||||
epicsEnvSet("NAME","mcu1")
|
||||
|
Reference in New Issue
Block a user