resolve conflicts
This commit is contained in:
parent
8cfe8fcf90
commit
e59e7f6a65
@ -18,6 +18,8 @@ if [ "$platform" == "broadcom" ]; then
|
|||||||
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
||||||
elif [ "$platform" == "cavium" ]; then
|
elif [ "$platform" == "cavium" ]; then
|
||||||
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
||||||
|
elif [ "$platform" == "nephos" ]; then
|
||||||
|
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
||||||
elif [ "$platform" == "barefoot" ]; then
|
elif [ "$platform" == "barefoot" ]; then
|
||||||
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
ORCHAGENT_ARGS+="-m $MAC_ADDRESS"
|
||||||
fi
|
fi
|
||||||
|
Loading…
Reference in New Issue
Block a user