Some updates:

[core.git] / framework / main / exceptions / base64 / class_Base64EncodingModuloException.php

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