|
@@ -128,11 +128,11 @@ export default class LoadEnvGroupModal extends Component<PropsType, StateType> {
|
|
|
<b>{key}</b> is defined in both environments
|
|
<b>{key}</b> is defined in both environments
|
|
|
</ClashingKeyTitle>
|
|
</ClashingKeyTitle>
|
|
|
<ClashingKeyDefinitions>
|
|
<ClashingKeyDefinitions>
|
|
|
- <ClashingKeyLabel>Defined as</ClashingKeyLabel>
|
|
|
|
|
|
|
+ <ClashingKeyLabel>Old</ClashingKeyLabel>
|
|
|
<ClashingKeyValue>
|
|
<ClashingKeyValue>
|
|
|
{this.props.existingValues[key] || emptyValue}
|
|
{this.props.existingValues[key] || emptyValue}
|
|
|
</ClashingKeyValue>
|
|
</ClashingKeyValue>
|
|
|
- <ClashingKeyLabel>Replaced by</ClashingKeyLabel>
|
|
|
|
|
|
|
+ <ClashingKeyLabel>New</ClashingKeyLabel>
|
|
|
<ClashingKeyValue>
|
|
<ClashingKeyValue>
|
|
|
{formattedEnvironmentValue(value) || emptyValue}
|
|
{formattedEnvironmentValue(value) || emptyValue}
|
|
|
</ClashingKeyValue>
|
|
</ClashingKeyValue>
|
xetera