|
@@ -1294,7 +1294,7 @@ discard block |
|
|
block discarded – undo |
|
1294
|
1294
|
|
|
1295
|
1295
|
// Association Set |
|
1296
|
1296
|
if (!($this->model->GetAssociationSetName($thisEntitySet, $thisNavprop) == |
|
1297
|
|
- $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && |
|
|
1297
|
+ $this->model->GetAssociationSetName($thatEntitySet, $thatNavprop) && |
|
1298
|
1298
|
$this->model->GetAssociationFullName($thisNavprop) == $this->model->GetAssociationFullName($thatNavprop))) { |
|
1299
|
1299
|
return false; |
|
1300
|
1300
|
} |
|
@@ -1316,7 +1316,7 @@ discard block |
|
|
block discarded – undo |
|
1316
|
1316
|
|
|
1317
|
1317
|
if (null !== $thisOtherEntitySet) { |
|
1318
|
1318
|
if (!($this->model->GetAssociationEndName($thisNavprop->getPartner()) == |
|
1319
|
|
- $this->model->GetAssociationEndName($thatNavprop->getPartner()) && |
|
|
1319
|
+ $this->model->GetAssociationEndName($thatNavprop->getPartner()) && |
|
1320
|
1320
|
$thisOtherEntitySet->getName() == $thatOtherEntitySet->getName())) { |
|
1321
|
1321
|
return false; |
|
1322
|
1322
|
} |
Please login to merge, or discard this patch.