From 820ca75ca4f187ecb098329b6f89ad461f242dd8 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@osticket.com>
Date: Tue, 14 Jan 2014 05:37:27 +0000
Subject: [PATCH] Fix a rebase goof
---
include/class.collaborator.php | 13 -------------
1 file changed, 13 deletions(-)
diff --git a/include/class.collaborator.php b/include/class.collaborator.php
index abf0a52a4..b8adb9326 100644
--- a/include/class.collaborator.php
+++ b/include/class.collaborator.php
@@ -44,24 +44,11 @@ class Collaborator extends TicketUser {
return $this->load();
}
-<<<<<<< HEAD
- function __call($name, $args) {
-
- if(!($user=$this->getUser()) || !method_exists($user, $name))
- return false;
-
- return $args
- ? call_user_func_array(array($user, $name), $args)
- : call_user_func(array($user, $name));
- }
-
function __toString() {
return Format::htmlchars(sprintf('%s <%s>', $this->getName(),
$this->getEmail()));
}
-=======
->>>>>>> efe5b0f... Make collaborator extends ticket user - necessary for authtoken support
function getId() {
return $this->ht['id'];
}
--
GitLab