X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Finterfaces%2Fmailer%2Fclass_DeliverableMail.php;h=fe4068188b798431554bbf24b54601fb71a497d4;hp=b0727de221b7a995ee32a7ac7560b655fda34b85;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hpb=1daff5a94de037022058d8760a06bd869de67630

diff --git a/framework/main/interfaces/mailer/class_DeliverableMail.php b/framework/main/interfaces/mailer/class_DeliverableMail.php
index b0727de2..fe406818 100644
--- a/framework/main/interfaces/mailer/class_DeliverableMail.php
+++ b/framework/main/interfaces/mailer/class_DeliverableMail.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Manager\Login\ManageableMember;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/interfaces/mailer/class_DeliverableMail.php
  * @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/interfaces/mailer/class_DeliverableMail.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  *