fixed conflict and removed test in initializer

This commit is contained in:
Jonathan Labreuille
2015-07-29 16:56:23 +02:00
9 changed files with 192 additions and 339 deletions

View File

@@ -6,14 +6,6 @@ use MailPoet\WP;
if(!defined('ABSPATH')) exit;
/*
this is a comment
*/
// another comment
$var = __('super long string
that takes multiple lines
and takes 3 lines');
class Initializer {
public $version;
@@ -23,12 +15,11 @@ class Initializer {
public $assets_path;
public $assets_url;
public function __construct($params = array(
'file' => '',
'version' => '1.0.0'
)) {
Env::init();
$this->data = array();
$this->version = $params['version'];
$this->shortname = 'wysija-newsletters';
@@ -343,4 +334,4 @@ class Initializer {
$this->shortname . '_version', $this->version
);
}
}
}