Some updates:

[core.git] / framework / main / classes / mailer / class_

diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_
index bb679b2281ea752e666596189c485cf7adc394fa..344579bffe765fa52053cf638d3cdfaff5744b81 100644 (file)
--- a/framework/main/classes/mailer/class_
+++ b/framework/main/classes/mailer/class_
@@ -1,10 +1,21 @@
 <?php
+// Own namespace
+namespace CoreFramework\Mailer\!!!;
+
+// Import framwork stuff
+use Org\Mxchange\CoreFramework\Mailer\BaseMailer;
+use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
+
 /**
- * 
+ * A ??? mailer class
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            0.0.0
+<<<<<<< HEAD:framework/main/classes/mailer/class_
  * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2017 Core Developer Team
+=======
+ * @copyright  Copyright (c) 2007, 2008 Roland Haeder, 2009 - 2016 Core Developer Team
+>>>>>>> Some updates::inc/main/classes/mailer/class_
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *
@@ -64,7 +75,5 @@ class ???Mailer extends BaseMailer implements DeliverableMail {
        public function sendAdminNotification() {
                $this->partialStub("You have to implement this method.");
        }
-}
 
-// [EOF]
-?>
+}