resolved merge conflict

diff --git a/CRM/Contact/BAO/Relationship.php b/CRM/Contact/BAO/Relationship.php
index 74c745308e02a2131c85e3bd35feb2739aa31a43..28d42a31fda1672412d202514365acaaff276c47 100644 (file)
--- 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)