From a4dc03f771d2e1f644bf2a370f104aa0d3c1cc95 Mon Sep 17 00:00:00 2001 From: Tim Mallezie Date: Thu, 12 Feb 2015 16:06:09 +0100 Subject: [PATCH] resolved merge conflict --- CRM/Contact/BAO/Relationship.php | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php index 74c745308e..28d42a31fd 100644 --- a/CRM/Contact/BAO/Relationship.php +++ b/CRM/Contact/BAO/Relationship.php @@ -39,11 +39,7 @@ class CRM_Contact_BAO_Relationship extends CRM_Contact_DAO_Relationship { * * @var int */ -<<<<<<< HEAD - const PAST = 1, DISABLED = 2, CURRENT = 4, INACTIVE = 8; -======= - CONST ALL = 0, PAST = 1, DISABLED = 2, CURRENT = 4, INACTIVE = 8; ->>>>>>> add context all, to get all relations of contact in ajax call + const ALL = 0, PAST = 1, DISABLED = 2, CURRENT = 4, INACTIVE = 8; /** * Create function. (Use the API instead) -- 2.25.1