X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fclasses%2Fmailer%2Fclass_;h=b25be3f6b30bbbbc30c96b1c1d098b739dc5d456;hp=344579bffe765fa52053cf638d3cdfaff5744b81;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0

diff --git a/framework/main/classes/mailer/class_ b/framework/main/classes/mailer/class_
index 344579bf..b25be3f6 100644
--- a/framework/main/classes/mailer/class_
+++ b/framework/main/classes/mailer/class_
@@ -11,11 +11,7 @@ use Org\Mxchange\CoreFramework\Mailer\DeliverableMail;
  *
  * @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
  *