reverted r39642 for a better solution to come

2012-07-02 20:43:00 +00:00 · 2012-07-02 20:43:00 +00:00 · c900737797
commit c900737797
parent ef0cc4f6bd
1 changed files with 0 additions and 16 deletions
--- 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