diff --git a/etemplate/inc/class.bo_merge.inc.php b/etemplate/inc/class.bo_merge.inc.php index 95c43415e2..df81271255 100644 --- a/etemplate/inc/class.bo_merge.inc.php +++ b/etemplate/inc/class.bo_merge.inc.php @@ -80,22 +80,6 @@ abstract class bo_merge * Parse HTML styles into target document style, if possible */ protected $parse_html_styles = true; - - /** - * Apps which currently support merge - * - * @var array $merge_apps (array appname => human-readable name) - * - */ - public static $merge_apps = array( - 'addressbook' => 'Addressbook', - 'calendar' => 'Calendar', - 'filemanager' => 'Filemanager', - 'infolog' => 'Infolog', - 'projectmanager' => 'Projectmanager', - 'timesheet' => 'Timesheet', - 'tracker' => 'Tracker', - ); /** * Constructor