X-Git-Url: https://git.mxchange.org/?p=core.git;a=blobdiff_plain;f=framework%2Fmain%2Fexceptions%2Fcrypto%2Fclass_EncryptMissingException.php;h=a6633ed229679e380cc13c844e9f3a0f05d530cb;hp=dc7685ec7b224b608a4c4815e18322db3d2f335a;hb=b002c5909aa0f781505dde5414964b0f014cde01;hpb=6a1f98717d2fdf0723c2852f99d15688755aac13

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