X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fbase64%2Fclass_Base64EncodingBadException.php;fp=framework%2Fmain%2Fexceptions%2Fbase64%2Fclass_Base64EncodingBadException.php;h=77fe03be0e67036569cb87a6728d74047a141908;hb=cad1ab5ecb2935a6ebf678555860c3bd96b525b0;hp=2fa669aecd7f8dc92e8bd84293356de90d542f31;hpb=1daff5a94de037022058d8760a06bd869de67630;p=core.git

diff --git a/framework/main/exceptions/base64/class_Base64EncodingBadException.php b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
index 2fa669ae..77fe03be 100644
--- a/framework/main/exceptions/base64/class_Base64EncodingBadException.php
+++ b/framework/main/exceptions/base64/class_Base64EncodingBadException.php
@@ -11,7 +11,11 @@ use Org\Mxchange\CoreFramework\Generic\FrameworkException;
  *
  * @author		Roland Haeder <webmaster@shipsimu.org>
  * @version		0.0.0
+<<<<<<< HEAD:framework/main/exceptions/base64/class_Base64EncodingBadException.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/exceptions/base64/class_Base64EncodingBadException.php
  * @license		GNU GPL 3.0 or any newer version
  * @link		http://www.shipsimu.org
  * @deprecated	Don't use this anymore