resolved merge conflict
authorTim Mallezie <tim.mallezie@chiro.be>
Thu, 12 Feb 2015 15:06:09 +0000 (16:06 +0100)
committerTim Mallezie <tim.mallezie@chiro.be>
Thu, 12 Feb 2015 15:06:09 +0000 (16:06 +0100)
commita4dc03f771d2e1f644bf2a370f104aa0d3c1cc95
tree39a9042b16828dfbcf3704b790166e8d447660c3
parent6c2921841cc1df0c5dfb0bf7123c9c3e1ea53102
resolved merge conflict
CRM/Contact/BAO/Relationship.php